Skip to content

Commit ea15a86

Browse files
Genkzsz11Rafiester
authored andcommitted
Revert "Navbar: Custom button light [1/2]"
This reverts commit ded07d4.
1 parent acce8d1 commit ea15a86

7 files changed

Lines changed: 2 additions & 265 deletions

File tree

core/java/android/os/IPowerManager.aidl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,4 @@ interface IPowerManager
101101
// update the uids being synchronized by network socket request manager
102102
void updateBlockedUids(int uid, boolean isBlocked);
103103

104-
// temporarily overrides the button brightness settings to allow the user to
105-
// see the effect of a settings change without applying it immediately
106-
void setTemporaryButtonBrightnessSettingOverride(int brightness);
107104
}

core/java/android/provider/Settings.java

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5187,40 +5187,6 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
51875187
*/
51885188
public static final String KEY_CAMERA_DOUBLE_TAP_ACTION = "key_camera_double_tap_action";
51895189

5190-
/**
5191-
* Custom button brightness value for manual mode
5192-
*
5193-
* @hide
5194-
*/
5195-
public static final String CUSTOM_BUTTON_BRIGHTNESS = "custom_button_brightness";
5196-
5197-
/**
5198-
* use same value for buttons as for screen (manual and auto mode)
5199-
*
5200-
* @hide
5201-
*/
5202-
public static final String CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS =
5203-
"custom_button_use_screen_brightness";
5204-
5205-
/**
5206-
* disable all button brightness (manual and auto mode)
5207-
*
5208-
* @hide
5209-
*/
5210-
public static final String BUTTON_BACKLIGHT_ENABLE = "button_backlight_enable";
5211-
5212-
/**
5213-
* Timeout value for button lights. 0 = disabled
5214-
* @hide
5215-
*/
5216-
public static final String BUTTON_BACKLIGHT_TIMEOUT = "button_backlight_timeout";
5217-
5218-
/**
5219-
* @hide
5220-
*/
5221-
public static final String BUTTON_BACKLIGHT_ON_TOUCH_ONLY =
5222-
"button_backlight_on_touch_only";
5223-
52245190
/**
52255191
* @hide
52265192
*/
@@ -5988,11 +5954,6 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
59885954
PRIVATE_SETTINGS.add(KEY_APP_SWITCH_DOUBLE_TAP_ACTION);
59895955
PRIVATE_SETTINGS.add(KEY_CAMERA_LONG_PRESS_ACTION);
59905956
PRIVATE_SETTINGS.add(KEY_CAMERA_DOUBLE_TAP_ACTION);
5991-
PRIVATE_SETTINGS.add(CUSTOM_BUTTON_BRIGHTNESS);
5992-
PRIVATE_SETTINGS.add(CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS);
5993-
PRIVATE_SETTINGS.add(BUTTON_BACKLIGHT_ENABLE);
5994-
PRIVATE_SETTINGS.add(BUTTON_BACKLIGHT_TIMEOUT);
5995-
PRIVATE_SETTINGS.add(BUTTON_BACKLIGHT_ON_TOUCH_ONLY);
59965957
PRIVATE_SETTINGS.add(FORCE_SHOW_NAVBAR);
59975958
PRIVATE_SETTINGS.add(ACCENT_COLOR);
59985959
PRIVATE_SETTINGS.add(SHOW_FOURG);

core/res/res/values/nad_config.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@
8181
<integer name="config_longPressOnCameraKeyBehavior">0</integer>
8282
<integer name="config_doubleTapOnCameraKeyBehavior">0</integer>
8383

84-
<!-- Button brightness -->
85-
<bool name="config_button_brightness_support">false</bool>
86-
<integer name="config_button_brightness_default">128</integer>
87-
8884
<!-- Older rotation sensors are not setting event.timestamp correctly. Setting to
8985
true will use SystemClock.elapsedRealtimeNanos() to set timestamp. -->
9086
<bool name="config_useSystemClockforRotationSensor">false</bool>

core/res/res/values/nad_symbols.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@
5555
<java-symbol type="integer" name="config_longPressOnAppSwitchKeyBehavior" />
5656
<java-symbol type="integer" name="config_longPressOnCameraKeyBehavior" />
5757

58-
<!-- Button brightness -->
59-
<java-symbol type="bool" name="config_button_brightness_support" />
60-
<java-symbol type="integer" name="config_button_brightness_default" />
61-
6258
<java-symbol type="bool" name="config_useSystemClockforRotationSensor" />
6359

6460
<!-- Gaming mode -->

packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,6 @@ public class SystemSettings {
8888
Settings.System.QS_SHOW_BATTERY_PERCENT,
8989
Settings.System.VOLUME_ROCKER_WAKE,
9090
Settings.System.NAVIGATION_BAR_ARROW_KEYS,
91-
Settings.System.CUSTOM_BUTTON_BRIGHTNESS,
92-
Settings.System.CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS,
93-
Settings.System.BUTTON_BACKLIGHT_ENABLE,
94-
Settings.System.BUTTON_BACKLIGHT_TIMEOUT,
95-
Settings.System.BUTTON_BACKLIGHT_ON_TOUCH_ONLY,
9691
Settings.System.FORCE_SHOW_NAVBAR,
9792
Settings.System.ACCENT_COLOR,
9893
Settings.System.STATUS_BAR_CUSTOM_HEADER,

packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,11 +222,6 @@ public boolean validate(@Nullable String value) {
222222
VALIDATORS.put(System.QS_PANEL_BG_USE_NEW_TINT, ANY_INTEGER_VALIDATOR);
223223
VALIDATORS.put(System.VOLUME_ROCKER_WAKE, BOOLEAN_VALIDATOR);
224224
VALIDATORS.put(System.NAVIGATION_BAR_ARROW_KEYS, BOOLEAN_VALIDATOR);
225-
VALIDATORS.put(System.CUSTOM_BUTTON_BRIGHTNESS, ANY_INTEGER_VALIDATOR);
226-
VALIDATORS.put(System.CUSTOM_BUTTON_USE_SCREEN_BRIGHTNESS, BOOLEAN_VALIDATOR);
227-
VALIDATORS.put(System.BUTTON_BACKLIGHT_ENABLE, BOOLEAN_VALIDATOR);
228-
VALIDATORS.put(System.BUTTON_BACKLIGHT_TIMEOUT, ANY_INTEGER_VALIDATOR);
229-
VALIDATORS.put(System.BUTTON_BACKLIGHT_ON_TOUCH_ONLY, BOOLEAN_VALIDATOR);
230225
VALIDATORS.put(System.FORCE_SHOW_NAVBAR, ANY_INTEGER_VALIDATOR);
231226
VALIDATORS.put(System.ACCENT_COLOR, ANY_INTEGER_VALIDATOR);
232227
VALIDATORS.put(System.STATUS_BAR_CUSTOM_HEADER, BOOLEAN_VALIDATOR);

0 commit comments

Comments
 (0)