Remove ALTERNATE_LAUNCHER_ENABLED from system setting.
Bug: 176185475
Test: manual test and unit test
Change-Id: Iaa5d6dd727c793c382434703d08f9248d16959fe
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index d08475d..ddead96 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -16622,12 +16622,6 @@
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 cf960aa..07b24f0 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -278,9 +278,6 @@
<!-- Whether to enable mute when off body by default. -->
<bool name="def_wearable_muteWhenOffBodyEnabled">true</bool>
- <!-- Whether to use an alternate launcher if available. -->
- <bool name="def_wearable_alternateLauncherEnabled">true</bool>
-
<!-- If a square screen, how rounded the corners are. Same as CSS border-radius property. -->
<integer name="def_wearable_squareScreenCornerRoundness">0</integer>
diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java
index a10b819..8da9e35 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 @@
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 ce7517f..568534f 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -5260,11 +5260,6 @@
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()
.getResources()
diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
index c9c93c4..b1e4f70 100644
--- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
+++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
@@ -624,7 +624,6 @@
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,
