| commit | 1e65cdcdd7beaa3d0ef35f5d14e30bf6da75bc22 | [log] [tgz] |
|---|---|---|
| author | Saumya Prakash <saumyaprakash@google.com> | Fri Jun 02 22:24:08 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 02 22:24:08 2023 +0000 |
| tree | 41ab018745aaa4c2e418086fab56fd7d4b7b7e48 | |
| parent | 530d20de09186d38ce44f679ae5eaa5bbb038006 [diff] | |
| parent | 0ebdfc66604b5f9b21415753d78972e3e65a6c15 [diff] |
Merge "Match displayed instruction with voiceover text." into udc-dev am: 0ebdfc6660 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23450321 Change-Id: Ic306ce6803e430153727057de006405a53cbb697 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java index 084f8c1..5ec92a6 100644 --- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java +++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -412,10 +412,12 @@ } mFeedbackTitleView.setText(titleResId); - mFeedbackSubtitleView.setText(spokenSubtitleResId == NO_ID - ? mContext.getText(subtitleResId) - : Utilities.wrapForTts( - mContext.getText(subtitleResId), mContext.getString(spokenSubtitleResId))); + mFeedbackSubtitleView.setText( + ENABLE_NEW_GESTURE_NAV_TUTORIAL.get() || spokenSubtitleResId == NO_ID + ? mContext.getText(subtitleResId) + : Utilities.wrapForTts( + mContext.getText(subtitleResId), + mContext.getString(spokenSubtitleResId))); if (isGestureSuccessful) { if (mTutorialFragment.isAtFinalStep()) { showActionButton();