PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change EditShortcutsPreferenceFragment to use a Preference for subtitle/description" into main

Browse Source
This commit is contained in:
Riley Jones
2024-03-05 02:53:47 +00:00
committed by Android (Google) Code Review
parent 739647a46d f8237aee94
commit ee25100639
2 changed files with 59 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
res/xml/accessibility_edit_shortcuts.xml
View File

@@ -18,66 +18,68 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto">
<PreferenceCategory
android:key="@string/accessibility_shortcut_description_pref">
<Preference
android:key="@string/accessibility_shortcut_description_pref"
android:persistent="false"
android:selectable="false"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"/>
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_fab_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.FloatingButtonShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_fab_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.FloatingButtonShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_gesture_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.GestureShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_gesture_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.GestureShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_nav_button_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.NavButtonShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_nav_button_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.NavButtonShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_volume_keys_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.VolumeKeysShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_volume_keys_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.VolumeKeysShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_two_fingers_double_tap_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.TwoFingersDoubleTapShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_two_fingers_double_tap_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.TwoFingersDoubleTapShortcutOptionController" />
<Preference
android:icon="@drawable/ic_keyboard_arrow_down"
android:key="@string/accessibility_shortcuts_advanced_collapsed"
android:persistent="false"
android:selectable="true"
android:title="@string/accessibility_shortcut_edit_dialog_title_advance"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.AdvancedShortcutsPreferenceController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_triple_tap_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.TripleTapShortcutOptionController" />
</PreferenceCategory>
<Preference
android:icon="@drawable/ic_keyboard_arrow_down"
android:key="@string/accessibility_shortcuts_advanced_collapsed"
android:persistent="false"
android:selectable="true"
android:title="@string/accessibility_shortcut_edit_dialog_title_advance"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.AdvancedShortcutsPreferenceController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_triple_tap_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.TripleTapShortcutOptionController" />
</PreferenceScreen>

4
src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
View File

@@ -207,9 +207,9 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment {
activity.setTitle(titles.first);
String categoryKey = activity.getResources().getString(
String screenDescriptionPrefKey = getString(
R.string.accessibility_shortcut_description_pref);
findPreference(categoryKey).setTitle(titles.second);
findPreference(screenDescriptionPrefKey).setSummary(titles.second);
}
@NonNull