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

Commit 217b1f35 authored by Saumya Prakash's avatar Saumya Prakash Committed by Automerger Merge Worker
Browse files

Merge "Match displayed instruction with voiceover text." into udc-dev am: 0ebdfc66 am: 1e65cdcd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23450321



Change-Id: I9ab9421797150c221202be6817d4414f1dbecfb8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8191575b 1e65cdcd

quickstep/src/com/android/quickstep/interaction/TutorialController.java

+6 −4
Original line number Diff line number Diff line
@@ -412,10 +412,12 @@ abstract class TutorialController implements BackGestureAttemptCallback, 
        }



        mFeedbackTitleView.setText(titleResId);

        mFeedbackSubtitleView.setText(spokenSubtitleResId == NO_ID

        mFeedbackSubtitleView.setText(

                ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() || spokenSubtitleResId == NO_ID

                        ? mContext.getText(subtitleResId)

                        : Utilities.wrapForTts(

                        mContext.getText(subtitleResId), mContext.getString(spokenSubtitleResId)));

                                mContext.getText(subtitleResId),

                                mContext.getString(spokenSubtitleResId)));

        if (isGestureSuccessful) {

            if (mTutorialFragment.isAtFinalStep()) {

                showActionButton();