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

Commit b7f6af15 authored by Haiping Yang's avatar Haiping Yang Committed by Android (Google) Code Review
Browse files

Merge "Remove CORNER_ROUNDNESS setting."

parents 841316e2 772aa7f6

core/java/android/provider/Settings.java

+0 −6
Original line number Diff line number Diff line
@@ -17205,12 +17205,6 @@ public final class Settings { 
             */

            public static final String WEAR_OS_VERSION_STRING = "wear_os_version_string";













            /**













             * How round the corners of square screens are.













             * @hide













             */













            public static final String CORNER_ROUNDNESS = "corner_roundness";



























            /**















             * Whether the physical button has been set.















             * @hide

























packages/SettingsProvider/res/values/defaults.xml



+0
−3






























Original line number
Diff line number
Diff line








@@ -275,9 +275,6 @@













    <!-- Whether to enable mute when off body by default. -->















    <bool name="def_wearable_muteWhenOffBodyEnabled">true</bool>





























    <!-- If a square screen, how rounded the corners are. Same as CSS border-radius property. -->













    <integer name="def_wearable_squareScreenCornerRoundness">0</integer>





























    <!-- Side button present -->















    <bool name="def_wearable_sideButtonPresent">true</bool>

















































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



+0
−1






























Original line number
Diff line number
Diff line








@@ -250,7 +250,6 @@ public class GlobalSettingsValidators {













                            String.valueOf(Global.Wearable.STEM_TYPE_CONTACT_LAUNCH)















                        }));















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













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















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















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















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

































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



+0
−6






























Original line number
Diff line number
Diff line








@@ -5273,12 +5273,6 @@ public class SettingsProvider extends ContentProvider {













                                    .getBoolean(R.bool.def_wearable_muteWhenOffBodyEnabled));















                    initGlobalSettingsDefaultValForWearLocked(















                            Global.Wearable.WEAR_OS_VERSION_STRING, "");













                    initGlobalSettingsDefaultValForWearLocked(













                            Global.Wearable.CORNER_ROUNDNESS,













                            getContext()













                                    .getResources()













                                    .getInteger(













                                            R.integer.def_wearable_squareScreenCornerRoundness));















                    initGlobalSettingsDefaultValForWearLocked(Global.Wearable.BUTTON_SET, false);















                    initGlobalSettingsDefaultValForWearLocked(















                            Global.Wearable.SIDE_BUTTON,

































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



+0
−1






























Original line number
Diff line number
Diff line








@@ -622,7 +622,6 @@ public class SettingsBackupTest {













                    Settings.Global.Wearable.STEM_3_DATA,















                    Settings.Global.Wearable.STEM_3_DEFAULT_DATA,















                    Settings.Global.Wearable.WEAR_OS_VERSION_STRING,













                    Settings.Global.Wearable.CORNER_ROUNDNESS,















                    Settings.Global.Wearable.BUTTON_SET,















                    Settings.Global.Wearable.SIDE_BUTTON,















                    Settings.Global.Wearable.ANDROID_WEAR_VERSION,