Settings: persist backlight brightness setting

Save the user value locally every time it is modified so we can retreive
it reliably.

Change-Id: I0d4489c17809a7a53864ab553d97aed60a8f8e88
Signed-off-by: Roman Birg <roman@cyngn.com>

1 files changed, 2 insertions, 11 deletions

diff --git a/src/com/android/settings/ButtonSettings.java b/src/com/android/settings/ButtonSettings.java
index 843d668..73296d5 100644
--- a/src/com/android/settings/ButtonSettings.java
+++ b/src/com/android/settings/ButtonSettings.java
@@ -591,7 +591,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
             Settings.Secure.putInt(context.getContentResolver(),
                     Settings.Secure.BUTTON_BRIGHTNESS, 0);
         } else {
-            int oldBright = prefs.getInt("pre_navbar_button_backlight", defaultBrightness);
+            int oldBright = prefs.getInt(ButtonBacklightBrightness.KEY_BUTTON_BACKLIGHT,
+                    defaultBrightness);
             Settings.Secure.putInt(context.getContentResolver(),
                     Settings.Secure.BUTTON_BRIGHTNESS, oldBright);
         }
@@ -672,16 +673,6 @@ 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);