diff options
| author | 2021-01-11 19:13:52 -0800 | |
|---|---|---|
| committer | 2021-11-10 14:27:21 -0800 | |
| commit | c3e3ecf31d90695efb18e4516d9495ad7f0cebdb (patch) | |
| tree | 96f6255b2b0530dc272ccd7c4cf63e53fbeb8c35 | |
| parent | b9d59dc46e235f93f81bb3105998cf28ea4772a1 (diff) | |
Remove the SCREEN_BRIGHTNESS_LEVEL setting.
Bug: 177241166
Test: manual test and unit test
Change-Id: I6903d568b1e641946faa248425ec685d4a42485d
(cherry picked from commit d9f1fd1c99df8ac49ae753a11053bd22ff81cfba)
4 files changed, 0 insertions, 15 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 295ed774f1e4..e226fa1e30a7 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -16609,12 +16609,6 @@ public final class Settings { public static final String WEAR_PLATFORM_MR_NUMBER = "wear_platform_mr_number"; /** - * The different levels of screen brightness the user can select. - * @hide - */ - public static final String SCREEN_BRIGHTNESS_LEVEL = "screen_brightness_level"; - - /** * The mobile signal detector setting. * @hide */ diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 713faaa2f063..986fd452c1a1 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -303,9 +303,6 @@ <!-- This value is used for the default system capabilities used on LE device. --> <string name="def_wearable_leSystemCapabilities" translatable="false">1</string> - <!-- Brightness levels, on a 0-255 scale --> - <string name="def_wearable_brightnessLevels" translatable="false">255,204,153,102,51</string> - <!-- Whether to allow mobile signal detector by default. --> <bool name="def_wearable_mobileSignalDetectorAllowed">true</bool> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index cd4047bf48b2..527fd88c6980 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -5294,11 +5294,6 @@ public class SettingsProvider extends ContentProvider { Global.Wearable.WEAR_PLATFORM_MR_NUMBER, SystemProperties.getInt("ro.cw_build.platform_mr", 0)); initGlobalSettingsDefaultValForWearLocked( - Settings.Global.Wearable.SCREEN_BRIGHTNESS_LEVEL, - getContext() - .getResources() - .getString(R.string.def_wearable_brightnessLevels)); - initGlobalSettingsDefaultValForWearLocked( Settings.Global.Wearable.MOBILE_SIGNAL_DETECTOR, getContext() .getResources() diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index c05e01dda1a5..189004cc2164 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -632,7 +632,6 @@ public class SettingsBackupTest { Settings.Global.Wearable.SYSTEM_CAPABILITIES, Settings.Global.Wearable.SYSTEM_EDITION, Settings.Global.Wearable.WEAR_PLATFORM_MR_NUMBER, - Settings.Global.Wearable.SCREEN_BRIGHTNESS_LEVEL, Settings.Global.Wearable.MOBILE_SIGNAL_DETECTOR, Settings.Global.Wearable.AMBIENT_ENABLED, Settings.Global.Wearable.AMBIENT_TILT_TO_WAKE, |