diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/ButtonSettings.java | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/com/android/settings/ButtonSettings.java b/src/com/android/settings/ButtonSettings.java index d200679..843d668 100644 --- a/src/com/android/settings/ButtonSettings.java +++ b/src/com/android/settings/ButtonSettings.java @@ -587,25 +587,14 @@ public class ButtonSettings extends SettingsPreferenceFragment implements cmHardwareManager.set(CmHardwareManager.FEATURE_KEY_DISABLE, enabled); /* Save/restore button timeouts to disable them in softkey mode */ - Editor editor = prefs.edit(); - if (enabled) { - int currentBrightness = Settings.Secure.getInt(context.getContentResolver(), - Settings.Secure.BUTTON_BRIGHTNESS, defaultBrightness); - if (!prefs.contains("pre_navbar_button_backlight")) { - editor.putInt("pre_navbar_button_backlight", currentBrightness); - } Settings.Secure.putInt(context.getContentResolver(), Settings.Secure.BUTTON_BRIGHTNESS, 0); } else { - int oldBright = prefs.getInt("pre_navbar_button_backlight", -1); - if (oldBright != -1) { - Settings.Secure.putInt(context.getContentResolver(), - Settings.Secure.BUTTON_BRIGHTNESS, oldBright); - editor.remove("pre_navbar_button_backlight"); - } + int oldBright = prefs.getInt("pre_navbar_button_backlight", defaultBrightness); + Settings.Secure.putInt(context.getContentResolver(), + Settings.Secure.BUTTON_BRIGHTNESS, oldBright); } - editor.commit(); } private void updateDisableNavkeysOption() { @@ -683,6 +672,16 @@ public class ButtonSettings extends SettingsPreferenceFragment implements } else if (preference == mDisableNavigationKeys) { mDisableNavigationKeys.setEnabled(false); mNavigationPreferencesCat.setEnabled(false); + + if (mDisableNavigationKeys.isChecked()) { + // enabling virtual nav keys, back it up lights setting + final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences( + getActivity()); + int currentBrightness = Settings.Secure.getInt(getActivity().getContentResolver(), + Settings.Secure.BUTTON_BRIGHTNESS, -1); + prefs.edit().putInt("pre_navbar_button_backlight", currentBrightness).apply(); + } + writeDisableNavkeysOption(getActivity(), mDisableNavigationKeys.isChecked()); updateDisableNavkeysOption(); updateDisableNavkeysCategories(true); |