Add a supported type 'gesture' under ACCESSIBILITY_BUTTON_MODE am: 2e24cc7a87 am: ea79ca3482 (88dff85e) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -9985,15 +9985,18 @@ public final class Settings {

		/**
		* Controls the accessibility button mode. System will force-set the value to {@link
		* #ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU} if {@link #NAVIGATION_MODE} is fully
		* gestural.
		* #ACCESSIBILITY_BUTTON_MODE_GESTURE} if {@link #NAVIGATION_MODE} is button; force-set the
		* value to {@link ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR} if {@link #NAVIGATION_MODE} is
		* gestural; otherwise, remain the option.
		* <ul>
		* <li> 0 = button in navigation bar </li>
		* <li> 1 = button floating on the display </li>
		* <li> 2 = button using gesture to trigger </li>
		* </ul>
		*
		* @see #ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR
		* @see #ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU
		* @see #ACCESSIBILITY_BUTTON_MODE_GESTURE
		* @hide
		*/
		public static final String ACCESSIBILITY_BUTTON_MODE =
		@@ -10015,6 +10018,14 @@ public final class Settings {
		*/
		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.
		* <ul>

+1 −1

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