Settings: use correct default value for backlight brightness

When the user has enabled the nav bar through the setupwizard and
returns back to the buttons settings and toggles the nav bar off, the
backlight brightness would not be restored because there was no previous
value to read from, so use the default framework value if none exists.

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

1 files changed, 4 insertions, 6 deletions

diff --git a/src/com/android/settings/ButtonSettings.java b/src/com/android/settings/ButtonSettings.java
index d200679..255c883 100644
--- a/src/com/android/settings/ButtonSettings.java
+++ b/src/com/android/settings/ButtonSettings.java
@@ -598,12 +598,10 @@ 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", -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.remove("pre_navbar_button_backlight");
         }
         editor.commit();
     }