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

Merge "Remove CARD_PREVIEW_MODE settings as it's no longer needed"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-23 23:45:26 +00:00
committed by Android (Google) Code Review
parent f71d684f17 5ff095dee7
commit caba53034b
4 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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