Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 394a85f7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove the SCREEN_BRIGHTNESS_LEVEL setting."

parents bb3d8639 c3e3ecf3

core/java/android/provider/Settings.java

+0 −6
Original line number Diff line number Diff line
@@ -16607,12 +16607,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

























packages/SettingsProvider/res/values/defaults.xml



+0
−3




























Original line number
Diff line number
Diff line








@@ -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>

















































packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java



+0
−5




























Original line number
Diff line number
Diff line








@@ -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()

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -631,7 +631,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,