diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 295ed774f1e4c..e226fa1e30a74 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -16608,12 +16608,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 713faaa2f0633..986fd452c1a1b 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -303,9 +303,6 @@ 1 - - 255,204,153,102,51 - true diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index cd4047bf48b22..527fd88c69807 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -5293,11 +5293,6 @@ public class SettingsProvider extends ContentProvider { initGlobalSettingsDefaultValForWearLocked( 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() diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index c05e01dda1a5b..189004cc21642 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,