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

Commit 21b2340e authored by Josh Yang's avatar Josh Yang
Browse files

Remove the settings DISPLAY_SHAPE and BOTTOM_OFFSET 

Bug: 176925729
Test: manual test and unit test
Change-Id: Id0c9749636d200fc7479d103dfff787dce1d98d3
(cherry picked from commit 01f4f2b9ec345e6335c7e843cec9d71d61b569a7)
parent a14619e6

core/java/android/provider/Settings.java

+0 −18
Original line number Diff line number Diff line
@@ -16608,24 +16608,6 @@ public final class Settings { 
             */

            public static final String WEAR_PLATFORM_MR_NUMBER = "wear_platform_mr_number";













            /**













             * The offset of the visible screen from the display bottom (overscan bottom).













             * @hide













             */













            public static final String BOTTOM_OFFSET = "bottom_offset";

























            /**













             * The shape of the display.













             * @hide













             */













            public static final String DISPLAY_SHAPE = "display_shape";

























            // Possible display shapes













            /** @hide */













            public static final int DISPLAY_SHAPE_SQUARE = 0;













            /** @hide */













            public static final int DISPLAY_SHAPE_ROUND = 1;



























            /**















             * The different levels of screen brightness the user can select.















             * @hide

























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



+0
−8




























Original line number
Diff line number
Diff line








@@ -257,14 +257,6 @@ public class GlobalSettingsValidators {













        VALIDATORS.put(Global.Wearable.SYSTEM_CAPABILITIES, ANY_INTEGER_VALIDATOR);















        VALIDATORS.put(Global.Wearable.SYSTEM_EDITION, ANY_INTEGER_VALIDATOR);















        VALIDATORS.put(Global.Wearable.WEAR_PLATFORM_MR_NUMBER, ANY_INTEGER_VALIDATOR);













        VALIDATORS.put(Global.Wearable.BOTTOM_OFFSET, ANY_INTEGER_VALIDATOR);













        VALIDATORS.put(













                Global.Wearable.DISPLAY_SHAPE,













                new DiscreteValueValidator(













                        new String[] {













                            String.valueOf(Global.Wearable.DISPLAY_SHAPE_ROUND),













                            String.valueOf(Global.Wearable.DISPLAY_SHAPE_SQUARE)













                        }));















        VALIDATORS.put(Global.Wearable.MOBILE_SIGNAL_DETECTOR, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Global.Wearable.AMBIENT_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Global.Wearable.AMBIENT_TILT_TO_WAKE, BOOLEAN_VALIDATOR);

































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.BOTTOM_OFFSET, 0);













                    initGlobalSettingsDefaultValForWearLocked(













                            Settings.Global.Wearable.DISPLAY_SHAPE,













                            Settings.Global.Wearable.DISPLAY_SHAPE_SQUARE);















                    initGlobalSettingsDefaultValForWearLocked(















                            Settings.Global.Wearable.SCREEN_BRIGHTNESS_LEVEL,















                            getContext()

































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



+0
−2




























Original line number
Diff line number
Diff line








@@ -632,8 +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.DISPLAY_SHAPE,













                    Settings.Global.Wearable.BOTTOM_OFFSET,















                    Settings.Global.Wearable.SCREEN_BRIGHTNESS_LEVEL,















                    Settings.Global.Wearable.MOBILE_SIGNAL_DETECTOR,















                    Settings.Global.Wearable.AMBIENT_ENABLED,