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

Commit e132fe67 authored by Riley Jones's avatar Riley Jones Committed by Android (Google) Code Review
Browse files

Merge "Change shortcut choser dialog to be more explicit" into main

parents 2144eb24 e2bfd3ab

core/java/com/android/internal/accessibility/dialog/AccessibilityButtonChooserActivity.java

+3 −10
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ import android.app.Activity; 
import android.content.ComponentName;

import android.os.Bundle;

import android.provider.Settings;

import android.text.TextUtils;

import android.view.View;

import android.view.accessibility.AccessibilityManager;

import android.widget.GridView;

import android.widget.TextView;
@@ -73,17 +71,12 @@ public class AccessibilityButtonChooserActivity extends Activity { 
            promptPrologue.setText(isTouchExploreOn

                    ? R.string.accessibility_gesture_3finger_prompt_text

                    : R.string.accessibility_gesture_prompt_text);

        }



        if (TextUtils.isEmpty(component)) {

            final TextView prompt = findViewById(R.id.accessibility_button_prompt);

            if (isGestureNavigateEnabled) {

            prompt.setText(isTouchExploreOn

                    ? R.string.accessibility_gesture_3finger_instructional_text

                    : R.string.accessibility_gesture_instructional_text);

        }

            prompt.setVisibility(View.VISIBLE);

        }



        mTargets.addAll(getTargets(this, SOFTWARE));

core/res/res/layout/accessibility_button_chooser.xml

+10 −11
Original line number Diff line number Diff line
@@ -47,6 +47,16 @@ 
            android:paddingTop="8dp"

            android:paddingBottom="8dp"/>



        <TextView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:id="@+id/accessibility_button_prompt"

            android:textAppearance="?attr/textAppearanceMedium"

            android:text="@string/accessibility_button_instructional_text"

            android:gravity="start|center_vertical"

            android:paddingTop="8dp"

            android:paddingBottom="8dp"/>



        <GridView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"
@@ -57,16 +67,5 @@ 
            android:horizontalSpacing="10dp"

            android:stretchMode="columnWidth"

            android:gravity="center"/>



        <TextView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:id="@+id/accessibility_button_prompt"

            android:textAppearance="?attr/textAppearanceMedium"

            android:text="@string/accessibility_button_instructional_text"

            android:gravity="start|center_vertical"

            android:paddingTop="8dp"

            android:paddingBottom="8dp"

            android:visibility="gone"/>

    </LinearLayout>

</com.android.internal.widget.ResolverDrawerLayout>

core/res/res/values/strings.xml

+7 −7
Original line number Diff line number Diff line
@@ -4844,19 +4844,19 @@ 
    <!-- Text spoken when accessibility shortcut warning dialog is shown. [CHAR LIMIT=none] -->

    <string name="accessibility_shortcut_spoken_feedback">Release the volume keys. To turn on <xliff:g id="service_name" example="TalkBack">%1$s</xliff:g>, press and hold both volume keys again for 3 seconds.</string>



    <!-- Text appearing in a prompt at the top of UI allowing the user to select a target service or feature to be assigned to the Accessibility button in the navigation bar. [CHAR LIMIT=none]-->

    <string name="accessibility_button_prompt_text">Choose a feature to use when you tap the accessibility button:</string>

    <!-- Text appearing in a prompt at the top of UI allowing the user to select a target service or feature to be assigned to the Accessibility button in the navigation bar or in gesture navigation. [CHAR LIMIT=none]-->

    <string name="accessibility_button_prompt_text">Choose a feature</string>

    <!-- Text appearing in a prompt at the top of UI allowing the user to select a target service or feature to be assigned to the Accessibility button when gesture navigation is enabled [CHAR LIMIT=none] -->

    <string name="accessibility_gesture_prompt_text">Choose a feature to use with the accessibility gesture (swipe up from the bottom of the screen with two fingers):</string>

    <string name="accessibility_gesture_prompt_text">Choose a feature</string>

    <!-- Text appearing in a prompt at the top of UI allowing the user to select a target service or feature to be assigned to the Accessibility button when gesture navigation and TalkBack is enabled [CHAR LIMIT=none] -->

    <string name="accessibility_gesture_3finger_prompt_text">Choose a feature to use with the accessibility gesture (swipe up from the bottom of the screen with three fingers):</string>

    <string name="accessibility_gesture_3finger_prompt_text">Choose a feature</string>



    <!-- Text describing how to display UI allowing a user to select a target service or feature to be assigned to the Accessibility button in the navigation bar. [CHAR LIMIT=none]-->

    <string name="accessibility_button_instructional_text">To switch between features, touch &amp; hold the accessibility button.</string>

    <string name="accessibility_button_instructional_text">The feature will open next time you tap the accessibility button.</string>

    <!-- Text describing how to display UI allowing a user to select a target service or feature to be assigned to the Accessibility button when gesture navigation is enabled. [CHAR LIMIT=none] -->

    <string name="accessibility_gesture_instructional_text">To switch between features, swipe up with two fingers and hold.</string>

    <string name="accessibility_gesture_instructional_text">The feature will open next time you use this shortcut. Swipe up with two fingers from the bottom of your screen and release quickly.</string>

    <!-- Text describing how to display UI allowing a user to select a target service or feature to be assigned to the Accessibility button when gesture navigation and TalkBack is enabled. [CHAR LIMIT=none] -->

    <string name="accessibility_gesture_3finger_instructional_text">To switch between features, swipe up with three fingers and hold.</string>

    <string name="accessibility_gesture_3finger_instructional_text">The feature will open next time you use this shortcut. Swipe up with three fingers from the bottom of your screen and release quickly.</string>



    <!-- Text used to describe system navigation features, shown within a UI allowing a user to assign system magnification features to the Accessibility button in the navigation bar. -->

    <string name="accessibility_magnification_chooser_text">Magnification</string>