Merge "Update accesibility button to suuport accessibility gesutre" into sc-v2-dev am: bd41311025
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085892 Change-Id: I2885e26d6ee4f7e323bf4eccd4f3fa27b608ac70
This commit is contained in:
@@ -16,8 +16,7 @@
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:title="@string/accessibility_button_title">
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<com.android.settingslib.widget.LayoutPreference
|
||||
android:key="caption_preview"
|
||||
@@ -37,6 +36,15 @@
|
||||
android:persistent="false"
|
||||
settings:controller="com.android.settings.accessibility.AccessibilityButtonLocationPreferenceController"/>
|
||||
|
||||
<ListPreference
|
||||
android:entries="@array/accessibility_button_gesture_selector_titles"
|
||||
android:entryValues="@array/accessibility_button_gesture_selector_values"
|
||||
android:key="accessibility_button_or_gesture"
|
||||
android:title="@string/accessibility_button_or_gesture_title"
|
||||
android:summary="%s"
|
||||
android:persistent="false"
|
||||
settings:controller="com.android.settings.accessibility.AccessibilityButtonGesturePreferenceController"/>
|
||||
|
||||
<ListPreference
|
||||
android:entries="@array/accessibility_button_size_selector_titles"
|
||||
android:entryValues="@array/accessibility_button_size_selector_values"
|
||||
@@ -61,7 +69,6 @@
|
||||
|
||||
<com.android.settings.accessibility.AccessibilityFooterPreference
|
||||
android:key="accessibility_button_footer"
|
||||
android:title="@string/accessibility_button_description"
|
||||
android:persistent="false"
|
||||
android:selectable="false"
|
||||
settings:searchable="false"
|
||||
|
@@ -25,8 +25,8 @@
|
||||
android:fragment="com.android.settings.accessibility.AccessibilityButtonFragment"
|
||||
android:key="accessibility_button_preference"
|
||||
android:persistent="false"
|
||||
android:title="@string/accessibility_button_title"
|
||||
android:summary="@string/accessibility_button_summary"/>
|
||||
android:summary="@string/accessibility_button_summary"
|
||||
settings:controller="com.android.settings.accessibility.AccessibilityButtonPreferenceController"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="accessibility_shortcut_preference"
|
||||
|
Reference in New Issue
Block a user