Skip to content
Snippets Groups Projects
Commit 21b7a74a authored by Jacob Hobbie's avatar Jacob Hobbie
Browse files

Adding sound/haptic settings.

Add Wear haptic settings for Active Unlock in main. These changes exist
only in tm-wear-kr3 right now, which means they need to be migrated to
main, and then later cherrypicked down. These global settings will be
accessible by other areas and are part of adding toggles to the Settings
pages on the watch.

Flag: EXEMPT bugfix
Test: with other CL
Bug: 379477908
Bug: 339488475
Change-Id: I2d5f06356e771124e62d7824112dd27c5edbc8af
parent 91ad856d
No related branches found
No related tags found
No related merge requests found
......@@ -19929,6 +19929,12 @@ public final class Settings {
*/
public static final String NETWORK_LOCATION_OPT_IN = "network_location_opt_in";
 
/**
* Whether haptics are enabled for Active Unlock on wear.
* @hide
*/
public static final String VIBRATE_FOR_ACTIVE_UNLOCK = "wear_vibrate_for_active_unlock";
/**
* The custom foreground color.
* @hide
......
......@@ -418,6 +418,7 @@ public class GlobalSettingsValidators {
VALIDATORS.put(Global.Wearable.CHARGING_SOUNDS_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.BEDTIME_MODE, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.BEDTIME_HARD_MODE, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.VIBRATE_FOR_ACTIVE_UNLOCK, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.DYNAMIC_COLOR_THEME_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.SCREENSHOT_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.UPGRADE_DATA_MIGRATION_STATUS,
......
......@@ -619,6 +619,7 @@ public class SettingsBackupTest {
Settings.Global.Wearable.COOLDOWN_MODE_ON,
Settings.Global.Wearable.BEDTIME_MODE,
Settings.Global.Wearable.BEDTIME_HARD_MODE,
Settings.Global.Wearable.VIBRATE_FOR_ACTIVE_UNLOCK,
Settings.Global.Wearable.LOCK_SCREEN_STATE,
Settings.Global.Wearable.DISABLE_AOD_WHILE_PLUGGED,
Settings.Global.Wearable.NETWORK_LOCATION_OPT_IN,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment