diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index a625217abfcae..cc511e6ece5b7 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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 diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index e3fb9b83fb448..9f10734d573ef 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -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); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 1d32404f0524f..79fca4ceb85b9 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -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() diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 7d877cc74fcf1..4b93e968b1f37 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -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,