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

Merge "Add trackpad system gesture settings API constants"

Browse Source
This commit is contained in:
Tracy Zhou
2022-12-15 00:58:13 +00:00
committed by Android (Google) Code Review
parent b0e4012c0a f7f287fd7b
commit 35feccef1e
4 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10722,6 +10722,49 @@ public final class Settings {
public static final String BACK_GESTURE_INSET_SCALE_RIGHT =
"back_gesture_inset_scale_right";
/**
* Indicates whether the trackpad back gesture is enabled.
* <p>Type: int (0 for false, 1 for true)
*
* @hide
*/
public static final String TRACKPAD_GESTURE_BACK_ENABLED = "trackpad_gesture_back_enabled";
/**
* Indicates whether the trackpad home gesture is enabled.
* <p>Type: int (0 for false, 1 for true)
*
* @hide
*/
public static final String TRACKPAD_GESTURE_HOME_ENABLED = "trackpad_gesture_home_enabled";
/**
* Indicates whether the trackpad overview gesture is enabled.
* <p>Type: int (0 for false, 1 for true)
*
* @hide
*/
public static final String TRACKPAD_GESTURE_OVERVIEW_ENABLED =
"trackpad_gesture_overview_enabled";
/**
* Indicates whether the trackpad notification gesture is enabled.
* <p>Type: int (0 for false, 1 for true)
*
* @hide
*/
public static final String TRACKPAD_GESTURE_NOTIFICATION_ENABLED =
"trackpad_gesture_notification_enabled";
/**
* Indicates whether the trackpad quick switch gesture is enabled.
* <p>Type: int (0 for false, 1 for true)
*
* @hide
*/
public static final String TRACKPAD_GESTURE_QUICK_SWITCH_ENABLED =
"trackpad_gesture_quick_switch_enabled";
/**
* Current provider of proximity-based sharing services.
* Default value in @string/config_defaultNearbySharingComponent.

11
core/proto/android/providers/settings/secure.proto
View File

@@ -596,6 +596,15 @@ message SecureSettingsProto {
optional SettingProto theme_customization_overlay_packages = 75 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto trust_agents_initialized = 57 [ (android.privacy).dest = DEST_AUTOMATIC ];
message TrackpadGesture {
optional SettingProto trackpad_gesture_back_enabled = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto trackpad_gesture_home_enabled = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto trackpad_gesture_overview_enabled = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto trackpad_gesture_notification_enabled = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto trackpad_gesture_quick_switch_enabled = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional TrackpadGesture trackpad_gesture = 94;
message Tts {
option (android.msg_privacy).dest = DEST_EXPLICIT;
@@ -687,5 +696,5 @@ message SecureSettingsProto {
// Please insert fields in alphabetical order and group them into messages
// if possible (to avoid reaching the method limit).
// Next tag = 94;
// Next tag = 95;
}

5
packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
View File

@@ -168,6 +168,11 @@ public class SecureSettings {
Settings.Secure.BACK_GESTURE_INSET_SCALE_LEFT,
Settings.Secure.BACK_GESTURE_INSET_SCALE_RIGHT,
Settings.Secure.NAVIGATION_MODE,
Settings.Secure.TRACKPAD_GESTURE_BACK_ENABLED,
Settings.Secure.TRACKPAD_GESTURE_HOME_ENABLED,
Settings.Secure.TRACKPAD_GESTURE_OVERVIEW_ENABLED,
Settings.Secure.TRACKPAD_GESTURE_NOTIFICATION_ENABLED,
Settings.Secure.TRACKPAD_GESTURE_QUICK_SWITCH_ENABLED,
Settings.Secure.SKIP_GESTURE_COUNT,
Settings.Secure.SKIP_TOUCH_COUNT,
Settings.Secure.SILENCE_ALARMS_GESTURE_COUNT,

5
packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
View File

@@ -255,6 +255,11 @@ public class SecureSettingsValidators {
new InclusiveFloatRangeValidator(0.0f, Float.MAX_VALUE));
VALIDATORS.put(Secure.BACK_GESTURE_INSET_SCALE_RIGHT,
new InclusiveFloatRangeValidator(0.0f, Float.MAX_VALUE));
VALIDATORS.put(Secure.TRACKPAD_GESTURE_BACK_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.TRACKPAD_GESTURE_HOME_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.TRACKPAD_GESTURE_OVERVIEW_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.TRACKPAD_GESTURE_NOTIFICATION_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.TRACKPAD_GESTURE_QUICK_SWITCH_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.AWARE_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.SKIP_GESTURE_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR);
VALIDATORS.put(Secure.SKIP_TOUCH_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR);