Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove ALTERNATE_LAUNCHER_ENABLED from system setting."

Browse Source
This commit is contained in:
TreeHugger Robot
2021-12-04 00:03:33 +00:00
committed by Android (Google) Code Review
parent 40d19efa10 5756c34ba8
commit 53057091be
5 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/provider/Settings.java
View File

@@ -16743,12 +16743,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

3
packages/SettingsProvider/res/values/defaults.xml
View File

@@ -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>

1
packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java
View File

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

5
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -5258,11 +5258,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()

1
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -625,7 +625,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,