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

Commit 5ff095de authored by Josh Yang's avatar Josh Yang Committed by haiping
Browse files

Remove CARD_PREVIEW_MODE settings as it's no longer needed 

The setting is removed in ag/13146549.

Bug: 164398026, 177355163
Test: manual test
Change-Id: Ib1b5797f429d98c02b34fee66412a5d06f5df4f7
parent 8738ba1a

core/java/android/provider/Settings.java

+0 −14
Original line number Diff line number Diff line
@@ -16437,20 +16437,6 @@ public final class Settings { 
             */

            public static final String ALTERNATE_LAUNCHER_ENABLED = "alternate_launcher_enabled";













            /**













             * Wear card preview mode.













             * @hide













             */













            public static final String CARD_PREVIEW_MODE = "card_preview_mode";

























            // Possible CARD_PREVIEW_MODE values.













            /** @hide */













            public static final int CARD_PREVIEW_MODE_LOW = 0;













            /** @hide */













            public static final int CARD_PREVIEW_MODE_NORMAL = 1;













            /** @hide */













            public static final int CARD_PREVIEW_MODE_HIGH = 2;



























            /**















             * How round the corners of square screens are.















             * @hide

























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



+0
−8




























Original line number
Diff line number
Diff line








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













                        }));















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















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













        VALIDATORS.put(













                Global.Wearable.CARD_PREVIEW_MODE,













                new DiscreteValueValidator(













                        new String[] {













                            String.valueOf(Global.Wearable.CARD_PREVIEW_MODE_LOW),













                            String.valueOf(Global.Wearable.CARD_PREVIEW_MODE_NORMAL),













                            String.valueOf(Global.Wearable.CARD_PREVIEW_MODE_HIGH)













                        }));















        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);

































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



+0
−3




























Original line number
Diff line number
Diff line








@@ -5256,9 +5256,6 @@ public class SettingsProvider extends ContentProvider {













                                getContext()















                                        .getResources()















                                        .getBoolean(R.bool.def_wearable_alternateLauncherEnabled));













                        initGlobalSettingsDefaultValForWearLocked(













                                Global.Wearable.CARD_PREVIEW_MODE,













                                Global.Wearable.CARD_PREVIEW_MODE_NORMAL);















                        initGlobalSettingsDefaultValForWearLocked(















                                Global.Wearable.CORNER_ROUNDNESS,















                                getContext()

































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



+0
−1




























Original line number
Diff line number
Diff line








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













                    Settings.Global.Wearable.MUTE_WHEN_OFF_BODY_ENABLED,















                    Settings.Global.Wearable.WEAR_OS_VERSION_STRING,















                    Settings.Global.Wearable.ALTERNATE_LAUNCHER_ENABLED,













                    Settings.Global.Wearable.CARD_PREVIEW_MODE,















                    Settings.Global.Wearable.CORNER_ROUNDNESS,















                    Settings.Global.Wearable.BUTTON_SET,















                    Settings.Global.Wearable.SIDE_BUTTON,