diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index d08475d09faa1..ddead962bcfc5 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -16621,12 +16621,6 @@ public final class Settings { */ public static final String WEAR_OS_VERSION_STRING = "wear_os_version_string"; - /** - * If an alternate launcher is enabled. - * @hide - */ - public static final String ALTERNATE_LAUNCHER_ENABLED = "alternate_launcher_enabled"; - /** * How round the corners of square screens are. * @hide diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index cf960aac56ac3..07b24f0a1eb9f 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -278,9 +278,6 @@ true - - true - 0 diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index a10b8194ba5ef..8da9e35a2ab22 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -247,7 +247,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.ALTERNATE_LAUNCHER_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); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index ce7517f14e77c..568534fa53311 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -5259,11 +5259,6 @@ public class SettingsProvider extends ContentProvider { .getBoolean(R.bool.def_wearable_muteWhenOffBodyEnabled)); initGlobalSettingsDefaultValForWearLocked( Global.Wearable.WEAR_OS_VERSION_STRING, ""); - initGlobalSettingsDefaultValForWearLocked( - Global.Wearable.ALTERNATE_LAUNCHER_ENABLED, - getContext() - .getResources() - .getBoolean(R.bool.def_wearable_alternateLauncherEnabled)); 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 c9c93c48af9d4..b1e4f700e8b8b 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -624,7 +624,6 @@ public class SettingsBackupTest { Settings.Global.Wearable.STEM_3_DEFAULT_DATA, Settings.Global.Wearable.MUTE_WHEN_OFF_BODY_ENABLED, Settings.Global.Wearable.WEAR_OS_VERSION_STRING, - Settings.Global.Wearable.ALTERNATE_LAUNCHER_ENABLED, Settings.Global.Wearable.CORNER_ROUNDNESS, Settings.Global.Wearable.BUTTON_SET, Settings.Global.Wearable.SIDE_BUTTON,