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

Commit be8b41db authored by Hongyu Long's avatar Hongyu Long
Browse files

a11y: Finalize the intro string for Voice Access dialog 

This CL will update the intro string for the Voice Access dialog.

Bug: b/410892855
Flag: com.android.hardware.input.enable_voice_access_key_gestures
Test: manual
Change-Id: I8558755f68ada3574d83e04d78a073a636e90731
parent 5cd06b53

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/data/repository/AccessibilityShortcutsRepositoryImplTest.kt

+4 −4
Original line number Original line Diff line number Diff line
@@ -148,7 +148,7 @@ class AccessibilityShortcutsRepositoryImplTest : SysuiTestCase() { 
            val type = KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_VOICE_ACCESS

            val type = KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_VOICE_ACCESS





            val a11yServiceInfo = spy(getMockAccessibilityServiceInfo("Voice access"))

            val a11yServiceInfo = spy(getMockAccessibilityServiceInfo("Voice access"))

            whenever(a11yServiceInfo.loadIntro(any())).thenReturn("Voice access Intro.")

            whenever(a11yServiceInfo.loadIntro(any())).thenReturn("Voice access default Intro.")

            whenever(

            whenever(

                    accessibilityManager.getInstalledServiceInfoWithComponentName(

                    accessibilityManager.getInstalledServiceInfoWithComponentName(

                        ComponentName.unflattenFromString(getTargetNameByType(type))

                        ComponentName.unflattenFromString(getTargetNameByType(type))
@@ -168,12 +168,12 @@ class AccessibilityShortcutsRepositoryImplTest : SysuiTestCase() { 
            assertThat(titleToContent?.first).isEqualTo("Turn on Voice access?")

            assertThat(titleToContent?.first).isEqualTo("Turn on Voice access?")

            val contentText = titleToContent?.second

            val contentText = titleToContent?.second

            assertThat(hasExpectedAnnotation(contentText)).isTrue()

            assertThat(hasExpectedAnnotation(contentText)).isTrue()

            // `contentText` here is an instance of SpannableStringBuilder, so we only need to

            // The intro should be the string below instead of the intro from

            // compare its value here.

            // AccessibilityServiceInfo.

            assertThat(contentText?.toString())

            assertThat(contentText?.toString())

                .isEqualTo(

                .isEqualTo(

                    "Action icon + Alt + V is the keyboard shortcut to use Voice access." +

                    "Action icon + Alt + V is the keyboard shortcut to use Voice access." +

                        " Voice access Intro."

                        " Voice access lets you control your device hands-free."

                )

                )

        }

        }

    }

    }

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -2854,6 +2854,8 @@ 
    <string name="accessibility_key_gesture_dialog_magnifier_intro">This allows you to quickly zoom in on the screen to make content larger.</string>

    <string name="accessibility_key_gesture_dialog_magnifier_intro">This allows you to quickly zoom in on the screen to make content larger.</string>

    <!-- The text for the TalkBack introduction. [CHAR LIMIT=NONE] -->

    <!-- The text for the TalkBack introduction. [CHAR LIMIT=NONE] -->

    <string name="accessibility_key_gesture_dialog_talkback_intro"><xliff:g name="feature_name" example="TalkBack">%1$s</xliff:g> is a screen reader that allows you to hear items spoken aloud. It can be helpful for people who have difficulty seeing the screen.</string>

    <string name="accessibility_key_gesture_dialog_talkback_intro"><xliff:g name="feature_name" example="TalkBack">%1$s</xliff:g> is a screen reader that allows you to hear items spoken aloud. It can be helpful for people who have difficulty seeing the screen.</string>

    <!-- The text for the Voice Access introduction. [CHAR LIMIT=NONE] -->

    <string name="accessibility_key_gesture_dialog_va_intro"><xliff:g name="feature_name" example="Voice Access">%1$s</xliff:g> lets you control your device hands-free.</string>

    <!-- Positive button text for the dialog. [CHAR LIMIT=NONE] -->

    <!-- Positive button text for the dialog. [CHAR LIMIT=NONE] -->

    <string name="accessibility_key_gesture_dialog_positive_button_text">Turn on</string>

    <string name="accessibility_key_gesture_dialog_positive_button_text">Turn on</string>

packages/SystemUI/src/com/android/systemui/accessibility/data/repository/AccessibilityShortcutsRepository.kt

+30 −11
Original line number Original line Diff line number Diff line
@@ -149,17 +149,13 @@ constructor( 
                        getFeatureName(

                        getFeatureName(

                            accessibilityServiceInfo.resolveInfo.loadLabel(packageManager)

                            accessibilityServiceInfo.resolveInfo.loadLabel(packageManager)

                        )

                        )

                    var intro = accessibilityServiceInfo.loadIntro(packageManager) ?: ""





                    // We don't re-use the existing intro from AccessibilityServiceInfo for

                    val intro =

                    // TalkBack.

                        getFeatureIntro(

                    if (keyGestureType == KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_SCREEN_READER) {

                            keyGestureType,

                        intro =

                            resources.getString(

                                R.string.accessibility_key_gesture_dialog_talkback_intro,

                            featureName,

                            featureName,

                            accessibilityServiceInfo.loadIntro(packageManager),

                        )

                        )

                    }





                    Pair(featureName, intro)

                    Pair(featureName, intro)

                }

                }
@@ -173,4 +169,27 @@ constructor( 
        val locale = context.resources.configuration.getLocales().get(0)

        val locale = context.resources.configuration.getLocales().get(0)

        return BidiFormatter.getInstance(locale).unicodeWrap(label)

        return BidiFormatter.getInstance(locale).unicodeWrap(label)

    }

    }



    /**

     * @param defaultIntro The intro we get from AccessibilityServiceInfo

     * @return A customize introduction

     */

    private fun getFeatureIntro(

        keyGestureType: Int,

        featureName: CharSequence,

        defaultIntro: CharSequence?,

    ): CharSequence {

        return when (keyGestureType) {

            KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_SCREEN_READER ->

                resources.getString(

                    R.string.accessibility_key_gesture_dialog_talkback_intro,

                    featureName,

                )



            KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_VOICE_ACCESS ->

                resources.getString(R.string.accessibility_key_gesture_dialog_va_intro, featureName)



            else -> defaultIntro ?: ""

        }

    }

}
 
}

packages/SystemUI/src/com/android/systemui/accessibility/keygesture/ui/KeyGestureDialogStartable.kt

+3 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,9 @@ constructor( 
    @VisibleForTesting var currentDialog: ComponentSystemUIDialog? = null

    @VisibleForTesting var currentDialog: ComponentSystemUIDialog? = null





    override fun start() {

    override fun start() {

        if (!Flags.enableTalkbackAndMagnifierKeyGestures()) {

        if (

            !Flags.enableTalkbackAndMagnifierKeyGestures() && !Flags.enableVoiceAccessKeyGestures()

        ) {

            return

            return

        }

        }