Revert "Navbar: Custom button light [1/2]"

This reverts commit ded07d4.
NusantaraProject-ROM · Dec 23, 2020 · ea15a86 · ea15a86
1 parent acce8d1
commit ea15a86
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 265 deletions.
diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl
@@ -101,7 +101,4 @@ interface IPowerManager
     // update the uids being synchronized by network socket request manager
     void updateBlockedUids(int uid, boolean isBlocked);
 
-    // temporarily overrides the button brightness settings to allow the user to
-    // see the effect of a settings change without applying it immediately
-    void setTemporaryButtonBrightnessSettingOverride(int brightness);
 }
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
@@ -5187,40 +5187,6 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
          */
         public static final String KEY_CAMERA_DOUBLE_TAP_ACTION = "key_camera_double_tap_action";
 
-        /**
-         * Custom button brightness value for manual mode
-         *
-         * @hide
-         */
-        public static final String CUSTOM_BUTTON_BRIGHTNESS = "custom_button_brightness";
-
-        /**
-         * use same value for buttons as for screen (manual and auto mode)
-         *
-         * @hide
-         */
-        public static final String CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS =
-                "custom_button_use_screen_brightness";
-
-        /**
-         * disable all button brightness (manual and auto mode)
-         *
-         * @hide
-         */
-        public static final String BUTTON_BACKLIGHT_ENABLE = "button_backlight_enable";
-
-        /**
-         * Timeout value for button lights. 0 = disabled
-         * @hide
-         */
-        public static final String BUTTON_BACKLIGHT_TIMEOUT = "button_backlight_timeout";
-
-        /**
-         * @hide
-         */
-        public static final String BUTTON_BACKLIGHT_ON_TOUCH_ONLY =
-                "button_backlight_on_touch_only";
-
         /**
          * @hide
          */
@@ -5988,11 +5954,6 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
             PRIVATE_SETTINGS.add(KEY_APP_SWITCH_DOUBLE_TAP_ACTION);
             PRIVATE_SETTINGS.add(KEY_CAMERA_LONG_PRESS_ACTION);
             PRIVATE_SETTINGS.add(KEY_CAMERA_DOUBLE_TAP_ACTION);
-            PRIVATE_SETTINGS.add(CUSTOM_BUTTON_BRIGHTNESS);
-            PRIVATE_SETTINGS.add(CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS);
-            PRIVATE_SETTINGS.add(BUTTON_BACKLIGHT_ENABLE);
-            PRIVATE_SETTINGS.add(BUTTON_BACKLIGHT_TIMEOUT);
-            PRIVATE_SETTINGS.add(BUTTON_BACKLIGHT_ON_TOUCH_ONLY);
             PRIVATE_SETTINGS.add(FORCE_SHOW_NAVBAR);
             PRIVATE_SETTINGS.add(ACCENT_COLOR);
             PRIVATE_SETTINGS.add(SHOW_FOURG);

diff --git a/core/res/res/values/nad_config.xml b/core/res/res/values/nad_config.xml
@@ -81,10 +81,6 @@
     <integer name="config_longPressOnCameraKeyBehavior">0</integer>
     <integer name="config_doubleTapOnCameraKeyBehavior">0</integer>
 
-    <!-- Button brightness -->
-    <bool name="config_button_brightness_support">false</bool>
-    <integer name="config_button_brightness_default">128</integer>
-
     <!-- Older rotation sensors are not setting event.timestamp correctly. Setting to
          true will use SystemClock.elapsedRealtimeNanos() to set timestamp. -->
     <bool name="config_useSystemClockforRotationSensor">false</bool>

diff --git a/core/res/res/values/nad_symbols.xml b/core/res/res/values/nad_symbols.xml
@@ -55,10 +55,6 @@
   <java-symbol type="integer" name="config_longPressOnAppSwitchKeyBehavior" />
   <java-symbol type="integer" name="config_longPressOnCameraKeyBehavior" />
 
-  <!-- Button brightness -->
-  <java-symbol type="bool" name="config_button_brightness_support" />
-  <java-symbol type="integer" name="config_button_brightness_default" />
-
   <java-symbol type="bool" name="config_useSystemClockforRotationSensor" />
 
   <!-- Gaming mode -->

diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java
@@ -88,11 +88,6 @@ public class SystemSettings {
         Settings.System.QS_SHOW_BATTERY_PERCENT,
         Settings.System.VOLUME_ROCKER_WAKE,
         Settings.System.NAVIGATION_BAR_ARROW_KEYS,
-        Settings.System.CUSTOM_BUTTON_BRIGHTNESS,
-        Settings.System.CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS,
-        Settings.System.BUTTON_BACKLIGHT_ENABLE,
-        Settings.System.BUTTON_BACKLIGHT_TIMEOUT,
-        Settings.System.BUTTON_BACKLIGHT_ON_TOUCH_ONLY,
         Settings.System.FORCE_SHOW_NAVBAR,
         Settings.System.ACCENT_COLOR,
         Settings.System.STATUS_BAR_CUSTOM_HEADER,

diff --git a/...s/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java b/...s/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java
@@ -222,11 +222,6 @@ public boolean validate(@Nullable String value) {
         VALIDATORS.put(System.QS_PANEL_BG_USE_NEW_TINT, ANY_INTEGER_VALIDATOR);
         VALIDATORS.put(System.VOLUME_ROCKER_WAKE, BOOLEAN_VALIDATOR);
         VALIDATORS.put(System.NAVIGATION_BAR_ARROW_KEYS, BOOLEAN_VALIDATOR);
-        VALIDATORS.put(System.CUSTOM_BUTTON_BRIGHTNESS, ANY_INTEGER_VALIDATOR);
-        VALIDATORS.put(System.CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS, BOOLEAN_VALIDATOR);
-        VALIDATORS.put(System.BUTTON_BACKLIGHT_ENABLE, BOOLEAN_VALIDATOR);
-        VALIDATORS.put(System.BUTTON_BACKLIGHT_TIMEOUT, ANY_INTEGER_VALIDATOR);
-        VALIDATORS.put(System.BUTTON_BACKLIGHT_ON_TOUCH_ONLY, BOOLEAN_VALIDATOR);
         VALIDATORS.put(System.FORCE_SHOW_NAVBAR, ANY_INTEGER_VALIDATOR);
         VALIDATORS.put(System.ACCENT_COLOR, ANY_INTEGER_VALIDATOR);
         VALIDATORS.put(System.STATUS_BAR_CUSTOM_HEADER, BOOLEAN_VALIDATOR);