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

Merge "Add settings key for touch and hold watch face"

Browse Source
This commit is contained in:
Prakriti Gupta
2022-03-07 17:53:53 +00:00
committed by Android (Google) Code Review
parent a1fb6ec297 696aa29145
commit 35663c3496
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17219,6 +17219,12 @@ public final class Settings {
*/
public static final String AMBIENT_TILT_TO_BRIGHT = "ambient_tilt_to_bright";
/**
* Whether touch and hold to edit WF is enabled
* @hide
*/
public static final String TOUCH_AND_HOLD_WATCH_FACE = "touch_and_hold_watchface";
/**
* Whether the current watchface is decomposable.
* @hide

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

@@ -315,6 +315,7 @@ public class GlobalSettingsValidators {
VALIDATORS.put(Global.USER_PREFERRED_RESOLUTION_WIDTH, ANY_INTEGER_VALIDATOR);
VALIDATORS.put(Global.Wearable.WET_MODE_ON, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.COOLDOWN_MODE_ON, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.TOUCH_AND_HOLD_WATCH_FACE, BOOLEAN_VALIDATOR);
}
}

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

@@ -662,7 +662,8 @@ public class SettingsBackupTest {
Settings.Global.Wearable.CLOCKWORK_LONG_PRESS_TO_ASSISTANT_ENABLED,
Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER,
Settings.Global.Wearable.WET_MODE_ON,
Settings.Global.Wearable.COOLDOWN_MODE_ON);
Settings.Global.Wearable.COOLDOWN_MODE_ON,
Settings.Global.Wearable.TOUCH_AND_HOLD_WATCH_FACE);
private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
newHashSet(