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

Merge "Added key Magnification capability"

Browse Source
This commit is contained in:
Minche Li
2020-03-16 08:31:45 +00:00
committed by Android (Google) Code Review
parent 95cb4043bb 2cc0471c77
commit 8a74075825
5 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8864,8 +8864,8 @@ public final class Settings {
public static final String WINDOW_MAGNIFICATION = "window_magnification";
/**
* Controls magnification mode when magnification is enabled via a system-wide
* triple tap gesture or the accessibility shortcut.
* Controls magnification mode when magnification is enabled via a system-wide triple tap
* gesture or the accessibility shortcut.
*
* @see#ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN
* @see#ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW
@@ -8886,6 +8886,25 @@ public final class Settings {
*/
public static final int ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW = 0x2;
/**
* Magnification mode value that is capable of magnifying whole display and particular
* region in a window.
* @hide
*/
public static final int ACCESSIBILITY_MAGNIFICATION_MODE_ALL = 0x3;
/**
* Controls magnification capability. Accessibility magnification is capable of at least one
* of the magnification modes.
*
* @see#ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN
* @see#ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW
* @see#ACCESSIBILITY_MAGNIFICATION_MODE_ALL
* @hide
*/
public static final String ACCESSIBILITY_MAGNIFICATION_CAPABILITY =
"accessibility_magnification_capability";
/**
* Keys we no longer back up under the current schema, but want to continue to
* process when restoring historical backup datasets.

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

@@ -75,9 +75,11 @@ message SecureSettingsProto {
// Settings for accessibility timeout
optional SettingProto non_interactive_ui_timeout_ms = 32 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto interactive_ui_timeout_ms = 33 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Settings for magnification mode
// Settings for accessibility magnification.
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 accessibility_magnification_capability = 35 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto button_long_press_targets = 36 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional Accessibility accessibility = 2;

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

@@ -164,6 +164,7 @@ public class SecureSettings {
Settings.Secure.AWARE_TAP_PAUSE_TOUCH_COUNT,
Settings.Secure.PEOPLE_STRIP,
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE,
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY,
Settings.Secure.ACCESSIBILITY_BUTTON_LONG_PRESS_TARGETS,
};
}

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

@@ -248,6 +248,10 @@ public class SecureSettingsValidators {
new InclusiveIntegerRangeValidator(
Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,
Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW));
VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY,
new InclusiveIntegerRangeValidator(
Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,
Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL));
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

@@ -1813,6 +1813,9 @@ class SettingsProtoDumpUtil {
dumpSetting(s, p,
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE,
SecureSettingsProto.Accessibility.ACCESSIBILITY_MAGNIFICATION_MODE);
dumpSetting(s, p,
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY,
SecureSettingsProto.Accessibility.ACCESSIBILITY_MAGNIFICATION_CAPABILITY);
dumpSetting(s, p,
Settings.Secure.ACCESSIBILITY_BUTTON_LONG_PRESS_TARGETS,
SecureSettingsProto.Accessibility.BUTTON_LONG_PRESS_TARGETS);