psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cherish:Disable navbar preferences if gestures are being used

Browse Source 
And inform the user

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
AshutoshSundresh
2020-11-10 08:46:20 +00:00
committed by Hưng Phan
parent 82961a3173
commit 182abd57ca
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values-vi/cherish_strings.xml
View File

@@ -766,4 +766,5 @@
<!-- Navbar options --> <!-- Navbar options -->
<string name="navigation_bar_invert_layout_title">Đảo ngược bố cục</string> <string name="navigation_bar_invert_layout_title">Đảo ngược bố cục</string>
<string name="navigation_bar_invert_layout_summary">Đảo ngược bố cục của thanh điều hướng và các mục khác, chẳng hạn như trình chuyển đổi IME</string> <string name="navigation_bar_invert_layout_summary">Đảo ngược bố cục của thanh điều hướng và các mục khác, chẳng hạn như trình chuyển đổi IME</string>
<string name="unsupported_gestures">Bật điều hướng hai nút hoặc ba nút để sử dụng tính năng này</string>
</resources> </resources>

1
res/values/cherish_strings.xml
View File

@@ -874,5 +874,6 @@
<!-- Navbar options --> <!-- Navbar options -->
<string name="navigation_bar_invert_layout_title">Invert layout</string> <string name="navigation_bar_invert_layout_title">Invert layout</string>
<string name="navigation_bar_invert_layout_summary">Inverts the layout of the navigation bar and other items, such as the IME switcher</string> <string name="navigation_bar_invert_layout_summary">Inverts the layout of the navigation bar and other items, such as the IME switcher</string>
<string name="unsupported_gestures">Enable two button or three button navigation to use this feature</string>
</resources> </resources>

24
src/com/cherish/settings/fragments/ButtonSettings.java
View File

@@ -33,6 +33,8 @@ import android.provider.Settings;
import com.android.settings.R; import com.android.settings.R;
import com.cherish.settings.preferences.SystemSettingSwitchPreference;
import com.cherish.settings.preferences.SecureSettingSwitchPreference;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.util.hwkeys.ActionConstants; import com.android.internal.util.hwkeys.ActionConstants;
import com.android.internal.util.hwkeys.ActionUtils; import com.android.internal.util.hwkeys.ActionUtils;
@@ -46,6 +48,8 @@ public class ButtonSettings extends ActionFragment implements OnPreferenceChange
private static final String KEY_BUTTON_BRIGHTNESS_SW = "button_brightness_sw"; private static final String KEY_BUTTON_BRIGHTNESS_SW = "button_brightness_sw";
private static final String KEY_BACKLIGHT_TIMEOUT = "backlight_timeout"; private static final String KEY_BACKLIGHT_TIMEOUT = "backlight_timeout";
private static final String HWKEY_DISABLE = "hardware_keys_disable"; private static final String HWKEY_DISABLE = "hardware_keys_disable";
private static final String PIXEL_ANIMATION_NAVIGATION = "pixel_nav_animation";
private static final String INVERT_NAVIGATION = "sysui_nav_bar_inverse";
// category keys // category keys
private static final String CATEGORY_HWKEY = "hardware_keys"; private static final String CATEGORY_HWKEY = "hardware_keys";
@@ -71,6 +75,8 @@ public class ButtonSettings extends ActionFragment implements OnPreferenceChange
private CustomSeekBarPreference mButtonBrightness; private CustomSeekBarPreference mButtonBrightness;
private SwitchPreference mButtonBrightness_sw; private SwitchPreference mButtonBrightness_sw;
private SwitchPreference mHwKeyDisable; private SwitchPreference mHwKeyDisable;
private SystemSettingSwitchPreference mPixelAnimationNavigation;
private SecureSettingSwitchPreference mInvertNavigation;
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
@@ -81,6 +87,24 @@ public class ButtonSettings extends ActionFragment implements OnPreferenceChange
final ContentResolver resolver = getActivity().getContentResolver(); final ContentResolver resolver = getActivity().getContentResolver();
final PreferenceScreen prefScreen = getPreferenceScreen(); final PreferenceScreen prefScreen = getPreferenceScreen();
mPixelAnimationNavigation = findPreference(PIXEL_ANIMATION_NAVIGATION);
mInvertNavigation = findPreference(INVERT_NAVIGATION);
// On three button nav
if (com.android.internal.util.cherish.CherishUtils.isThemeEnabled("com.android.internal.systemui.navbar.threebutton")) {
mPixelAnimationNavigation.setSummary(getString(R.string.pixel_navbar_anim_summary));
mInvertNavigation.setSummary(getString(R.string.navigation_bar_invert_layout_summary));
// On two button nav
} else if (com.android.internal.util.cherish.CherishUtils.isThemeEnabled("com.android.internal.systemui.navbar.twobutton")) {
mPixelAnimationNavigation.setSummary(getString(R.string.pixel_navbar_anim_summary));
mInvertNavigation.setSummary(getString(R.string.navigation_bar_invert_layout_summary));
// On gesture nav
} else {
mPixelAnimationNavigation.setSummary(getString(R.string.unsupported_gestures));
mInvertNavigation.setSummary(getString(R.string.unsupported_gestures));
mPixelAnimationNavigation.setEnabled(false);
mInvertNavigation.setEnabled(false);
}
final boolean needsNavbar = ActionUtils.hasNavbarByDefault(getActivity()); final boolean needsNavbar = ActionUtils.hasNavbarByDefault(getActivity());
final PreferenceCategory hwkeyCat = (PreferenceCategory) prefScreen final PreferenceCategory hwkeyCat = (PreferenceCategory) prefScreen
.findPreference(CATEGORY_HWKEY); .findPreference(CATEGORY_HWKEY);