From f8237aee940d7abfebb3895c4cce151b9a83f218 Mon Sep 17 00:00:00 2001
From: Riley Jones <jonesriley@google.com>
Date: Thu, 29 Feb 2024 21:43:46 +0000
Subject: [PATCH] Change EditShortcutsPreferenceFragment to use a Preference
 for subtitle/description

Replaces PreferenceCategory with unselectable Preference to better match desired visuals

Screenshot at https://x20web.corp.google.com/users/jo/jonesriley/dragToEdit/editScreenWithSubtitle.png

Flag: N/A
Test: N/A
Bug: 323388734
Change-Id: Ia1b333bc246ea4dd98070a646d5a8a1716ccbcee
---
 res/xml/accessibility_edit_shortcuts.xml      | 112 +++++++++---------
 .../EditShortcutsPreferenceFragment.java      |   4 +-
 2 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/res/xml/accessibility_edit_shortcuts.xml b/res/xml/accessibility_edit_shortcuts.xml
index 8be0ee50857..fdb5b99a641 100644
--- a/res/xml/accessibility_edit_shortcuts.xml
+++ b/res/xml/accessibility_edit_shortcuts.xml
@@ -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>
\ No newline at end of file
diff --git a/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java b/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
index 5a3b13ab640..aba342a792e 100644
--- a/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
@@ -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