From a69d69e01c262e9ab07d95fb8fb90942f074f75a Mon Sep 17 00:00:00 2001
From: menghanli <menghanli@google.com>
Date: Tue, 8 Feb 2022 17:05:55 +0800
Subject: [PATCH] Polish humanize strings for Accessibility button & gesture
 page

Bug: 218409088
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=AccessibilityButtonFooterPreferenceControllerTest

Change-Id: I9fde58d0a438aae68f0c8457f894e6b06ef97f3b
---
 res/values/strings.xml                        |  6 ++-
 res/xml/accessibility_button_settings.xml     | 46 ++++++++++---------
 ...ilityButtonFooterPreferenceController.java |  3 +-
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0107358d2d8..e325c3ae7b6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5348,6 +5348,8 @@
     <string name="accessibility_button_title">Accessibility button</string>
     <!-- Title for the accessibility button & gesture page. [CHAR LIMIT=35] -->
     <string name="accessibility_button_gesture_title">Accessibility button &amp; gesture</string>
+    <!-- Introduction for the accessibility button page. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_button_intro_text">Quickly access accessibility features from any screen</string>
     <!-- Title for the accessibility button footer. [CHAR LIMIT=35] -->
     <string name="accessibility_button_about_title">About accessibility button</string>
     <!-- Title for the accessibility button & gesture footer. [CHAR LIMIT=55] -->
@@ -5359,9 +5361,9 @@
     <!-- Summary text for the accessibility button preference. [CHAR LIMIT=50] -->
     <string name="accessibility_button_summary">Quickly access accessibility features</string>
     <!-- Description for the accessibility button in gesture navigation. Explain how this page works. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_button_gesture_description">Quickly access accessibility features from any screen.\n\nTo get started, go to accessibility settings and select a feature. Tap on the shortcut and select the accessibility button or gesture.</string>
+    <string name="accessibility_button_gesture_description"><b>How to use the button or gesture</b>\n\n1. Go to accessibility settings\n2. Select a feature and tap the shortcut\n3. To use the feature, tap the accessibility button or gesture</string>
     <!-- Description for the accessibility button page. Explain how this page works. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_button_description">Quickly access accessibility features from any screen.\n\nTo get started, go to accessibility settings and select a feature. Tap on the shortcut and select the accessibility button.</string>
+    <string name="accessibility_button_description"><b>How to use the button</b>\n\n1. Go to accessibility settings\n2. Select a feature and tap the shortcut\n3. To use the feature, tap the accessibility button</string>
     <!-- Title for the button or gesture of the accessibility button. [CHAR LIMIT=35] -->
     <string name="accessibility_button_or_gesture_title">Use button or gesture</string>
     <!-- Title for the location of the accessibility button. [CHAR LIMIT=35] -->
diff --git a/res/xml/accessibility_button_settings.xml b/res/xml/accessibility_button_settings.xml
index 86dd0875058..ab9fc41d16f 100644
--- a/res/xml/accessibility_button_settings.xml
+++ b/res/xml/accessibility_button_settings.xml
@@ -14,61 +14,65 @@
      limitations under the License.
 -->
 
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto">
 
+    <com.android.settingslib.widget.TopIntroPreference
+        android:key="accessibility_button_intro"
+        android:persistent="false"
+        android:title="@string/accessibility_button_intro_text" />
+
     <com.android.settingslib.widget.IllustrationPreference
         android:key="accessibility_button_preview"
-        android:selectable="false"
-        settings:searchable="false"
         android:persistent="false"
-        settings:controller="com.android.settings.accessibility.AccessibilityButtonPreviewPreferenceController"/>
+        android:selectable="false"
+        settings:controller="com.android.settings.accessibility.AccessibilityButtonPreviewPreferenceController"
+        settings:searchable="false" />
 
     <ListPreference
         android:entries="@array/accessibility_button_location_selector_titles"
         android:entryValues="@array/accessibility_button_location_selector_values"
         android:key="accessibility_button_location"
-        android:title="@string/accessibility_button_location_title"
-        android:summary="%s"
         android:persistent="false"
-        settings:controller="com.android.settings.accessibility.AccessibilityButtonLocationPreferenceController"/>
+        android:summary="%s"
+        android:title="@string/accessibility_button_location_title"
+        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"/>
+        android:summary="%s"
+        android:title="@string/accessibility_button_or_gesture_title"
+        settings:controller="com.android.settings.accessibility.AccessibilityButtonGesturePreferenceController" />
 
     <ListPreference
         android:entries="@array/accessibility_button_size_selector_titles"
         android:entryValues="@array/accessibility_button_size_selector_values"
         android:key="accessibility_button_size"
-        android:title="@string/accessibility_button_size_title"
-        android:summary="%s"
         android:persistent="false"
-        settings:controller="com.android.settings.accessibility.FloatingMenuSizePreferenceController"/>
+        android:summary="%s"
+        android:title="@string/accessibility_button_size_title"
+        settings:controller="com.android.settings.accessibility.FloatingMenuSizePreferenceController" />
 
     <SwitchPreference
         android:key="accessibility_button_fade"
-        android:title="@string/accessibility_button_fade_title"
-        android:summary="@string/accessibility_button_fade_summary"
         android:persistent="false"
-        settings:controller="com.android.settings.accessibility.FloatingMenuFadePreferenceController"/>
+        android:summary="@string/accessibility_button_fade_summary"
+        android:title="@string/accessibility_button_fade_title"
+        settings:controller="com.android.settings.accessibility.FloatingMenuFadePreferenceController" />
 
     <com.android.settings.widget.SeekBarPreference
         android:key="accessibility_button_opacity"
-        android:title="@string/accessibility_button_opacity_title"
         android:persistent="false"
-        settings:controller="com.android.settings.accessibility.FloatingMenuTransparencyPreferenceController"/>
+        android:title="@string/accessibility_button_opacity_title"
+        settings:controller="com.android.settings.accessibility.FloatingMenuTransparencyPreferenceController" />
 
     <com.android.settings.accessibility.AccessibilityFooterPreference
         android:key="accessibility_button_footer"
         android:persistent="false"
         android:selectable="false"
-        settings:searchable="false"
-        settings:controller="com.android.settings.accessibility.AccessibilityButtonFooterPreferenceController"/>
+        settings:controller="com.android.settings.accessibility.AccessibilityButtonFooterPreferenceController"
+        settings:searchable="false" />
 </PreferenceScreen>
diff --git a/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java
index 55b8019a7d1..ca9c3d86aec 100644
--- a/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java
+++ b/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java
@@ -50,9 +50,10 @@ public class AccessibilityButtonFooterPreferenceController extends
         final int titleResource = AccessibilityUtil.isGestureNavigateEnabled(mContext)
                 ? R.string.accessibility_button_gesture_description
                 : R.string.accessibility_button_description;
+        final CharSequence footerText = mContext.getText(titleResource);
         final AccessibilityFooterPreference footerPreference =
                 screen.findPreference(getPreferenceKey());
-        footerPreference.setTitle(titleResource);
+        footerPreference.setTitle(footerText);
         super.displayPreference(screen);
     }
 }