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

Merge "A new setting key to hold targets of the a11y button" into rvc-dev am: dba485be4c

Browse Source 
Change-Id: I73fcdcf5d76e1cb521c896d0815feea17a90b8cb
This commit is contained in:
Rhed Jao
2020-03-27 06:51:50 +00:00
committed by Automerger Merge Worker
parent 32f4a5f9b9 dba485be4c
commit 3f82de9a25
5 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6589,11 +6589,9 @@ public final class Settings {
"accessibility_shortcut_target_service";
/**
* Setting specifying the accessibility services, accessibility shortcut targets,
* or features to be toggled via the 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
* Setting specifying the accessibility service or feature to be toggled via the
* accessibility button in the navigation bar. This is either a flattened
* {@link ComponentName} or the class name of a system class implementing a supported
* accessibility feature.
* @hide
*/
@@ -6602,15 +6600,14 @@ public final class Settings {
/**
* Setting specifying the accessibility services, accessibility shortcut targets,
* or features to be toggled via the long press accessibility button in the navigation bar.
* or features to be toggled via the 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";
public static final String ACCESSIBILITY_BUTTON_TARGETS = "accessibility_button_targets";
/**
* The system class name of magnification controller which is a target to be toggled via
@@ -6775,8 +6772,8 @@ public final class Settings {
* zoom in the display content and is targeted to low vision users. The current
* magnification scale is controlled by {@link #ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE}.
*
* @deprecated Use {@link #ACCESSIBILITY_BUTTON_TARGET_COMPONENT} instead.
* {@link #ACCESSIBILITY_BUTTON_TARGET_COMPONENT} holds the magnification system class name
* @deprecated Use {@link #ACCESSIBILITY_BUTTON_TARGETS} instead.
* {@link #ACCESSIBILITY_BUTTON_TARGETS} holds the magnification system class name
* when navigation bar magnification is enabled.
* @hide
*/

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

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

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

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

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

@@ -78,9 +78,7 @@ public class SecureSettingsValidators {
ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);
// technically either ComponentName or class name, but there's proper value
// validation at callsites, so allow any non-null string
VALIDATORS.put(
Secure.ACCESSIBILITY_BUTTON_TARGET_COMPONENT,
ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);
VALIDATORS.put(Secure.ACCESSIBILITY_BUTTON_TARGET_COMPONENT, value -> value != null);
VALIDATORS.put(Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, BOOLEAN_VALIDATOR);
@@ -248,7 +246,7 @@ public class SecureSettingsValidators {
Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,
Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW));
VALIDATORS.put(
Secure.ACCESSIBILITY_BUTTON_LONG_PRESS_TARGETS,
Secure.ACCESSIBILITY_BUTTON_TARGETS,
ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);
}
}

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

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