Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a69d69e0 authored by menghanli's avatar menghanli
Browse files

Polish humanize strings for Accessibility button & gesture page 

Bug: 218409088
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=AccessibilityButtonFooterPreferenceControllerTest

Change-Id: I9fde58d0a438aae68f0c8457f894e6b06ef97f3b
parent f8ba876f

res/values/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -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] -->

res/xml/accessibility_button_settings.xml

+25 −21
Original line number Diff line number Diff line
@@ -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"

        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"

        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"

        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"

        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"

        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>

src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

    }

}