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

Merge "Support long press accessibility button (1/n)" into rvc-dev am: 02b288d66e

Browse Source 
Change-Id: I206d60f673b063dd9818802c791e54584927329a
This commit is contained in:
Automerger Merge Worker
2020-03-06 09:05:11 +00:00
parent ddb6ae971e 02b288d66e
commit ae6e89b657
5 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6607,6 +6607,18 @@ public final class Settings {
public static final String ACCESSIBILITY_BUTTON_TARGET_COMPONENT = public static final String ACCESSIBILITY_BUTTON_TARGET_COMPONENT =
"accessibility_button_target_component"; "accessibility_button_target_component";
/**
* Setting specifying the accessibility services, accessibility shortcut targets,
* or features to be toggled via the long press accessibility button in the navigation bar.
*
* <p> This is a colon-separated string list which contains the flattened
* {@link ComponentName} and the class name of a system class implementing a supported
* accessibility feature.
* @hide
*/
public static final String ACCESSIBILITY_BUTTON_LONG_PRESS_TARGETS =
"accessibility_button_long_press_targets";
/** /**
* The system class name of magnification controller which is a target to be toggled via * The system class name of magnification controller which is a target to be toggled via
* accessibility shortcut or accessibility button. * accessibility shortcut or accessibility button.

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

@@ -77,6 +77,7 @@ message SecureSettingsProto {
optional SettingProto interactive_ui_timeout_ms = 33 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto interactive_ui_timeout_ms = 33 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Settings for magnification mode // Settings for magnification mode
optional SettingProto accessibility_magnification_mode = 34 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto accessibility_magnification_mode = 34 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto button_long_press_targets = 35 [ (android.privacy).dest = DEST_AUTOMATIC ];
} }
optional Accessibility accessibility = 2; optional Accessibility accessibility = 2;

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

@@ -162,5 +162,6 @@ public class SecureSettings {
Settings.Secure.AWARE_TAP_PAUSE_TOUCH_COUNT, Settings.Secure.AWARE_TAP_PAUSE_TOUCH_COUNT,
Settings.Secure.PEOPLE_STRIP, Settings.Secure.PEOPLE_STRIP,
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE, Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE,
Settings.Secure.ACCESSIBILITY_BUTTON_LONG_PRESS_TARGETS,
}; };
} }

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

@@ -245,5 +245,8 @@ public class SecureSettingsValidators {
new InclusiveIntegerRangeValidator( new InclusiveIntegerRangeValidator(
Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN, Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,
Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW)); Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW));
VALIDATORS.put(
Secure.ACCESSIBILITY_BUTTON_LONG_PRESS_TARGETS,
ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);
} }
} }

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

@@ -1811,6 +1811,9 @@ class SettingsProtoDumpUtil {
dumpSetting(s, p, dumpSetting(s, p,
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE, Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE,
SecureSettingsProto.Accessibility.ACCESSIBILITY_MAGNIFICATION_MODE); SecureSettingsProto.Accessibility.ACCESSIBILITY_MAGNIFICATION_MODE);
dumpSetting(s, p,
Settings.Secure.ACCESSIBILITY_BUTTON_LONG_PRESS_TARGETS,
SecureSettingsProto.Accessibility.BUTTON_LONG_PRESS_TARGETS);
p.end(accessibilityToken); p.end(accessibilityToken);
final long adaptiveSleepToken = p.start(SecureSettingsProto.ADAPTIVE_SLEEP); final long adaptiveSleepToken = p.start(SecureSettingsProto.ADAPTIVE_SLEEP);