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

Add a supported type 'gesture' under ACCESSIBILITY_BUTTON_MODE am: 2e24cc7a87

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15124970

Change-Id: I937dc5d02390d416f040bcc198c0e31343371e13
This commit is contained in:
jasonwshsu
2021-07-22 19:12:03 +00:00
committed by Automerger Merge Worker
parent 177279f395 2e24cc7a87
commit ea79ca3482
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9964,15 +9964,18 @@ public final class Settings {
/** /**
* Controls the accessibility button mode. System will force-set the value to {@link * Controls the accessibility button mode. System will force-set the value to {@link
* #ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU} if {@link #NAVIGATION_MODE} is fully * #ACCESSIBILITY_BUTTON_MODE_GESTURE} if {@link #NAVIGATION_MODE} is button; force-set the
* gestural. * value to {@link ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR} if {@link #NAVIGATION_MODE} is
* gestural; otherwise, remain the option.
* <ul> * <ul>
* <li> 0 = button in navigation bar </li> * <li> 0 = button in navigation bar </li>
* <li> 1 = button floating on the display </li> * <li> 1 = button floating on the display </li>
* <li> 2 = button using gesture to trigger </li>
* </ul> * </ul>
* *
* @see #ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR * @see #ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR
* @see #ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU * @see #ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU
* @see #ACCESSIBILITY_BUTTON_MODE_GESTURE
* @hide * @hide
*/ */
public static final String ACCESSIBILITY_BUTTON_MODE = public static final String ACCESSIBILITY_BUTTON_MODE =
@@ -9994,6 +9997,14 @@ public final class Settings {
*/ */
public static final int ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU = 0x1; public static final int ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU = 0x1;
/**
* Accessibility button mode value that specifying the accessibility service or feature to
* be toggled via the gesture.
*
* @hide
*/
public static final int ACCESSIBILITY_BUTTON_MODE_GESTURE = 0x2;
/** /**
* The size of the accessibility floating menu. * The size of the accessibility floating menu.
* <ul> * <ul>

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

@@ -276,7 +276,7 @@ public class SecureSettingsValidators {
VALIDATORS.put(Secure.ACCESSIBILITY_BUTTON_MODE, VALIDATORS.put(Secure.ACCESSIBILITY_BUTTON_MODE,
new InclusiveIntegerRangeValidator( new InclusiveIntegerRangeValidator(
Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR, Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR,
Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU)); Secure.ACCESSIBILITY_BUTTON_MODE_GESTURE));
VALIDATORS.put(Secure.ACCESSIBILITY_FLOATING_MENU_SIZE, VALIDATORS.put(Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
new DiscreteValueValidator(new String[] {"0", "1"})); new DiscreteValueValidator(new String[] {"0", "1"}));
VALIDATORS.put(Secure.ACCESSIBILITY_FLOATING_MENU_ICON_TYPE, VALIDATORS.put(Secure.ACCESSIBILITY_FLOATING_MENU_ICON_TYPE,