mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-04 01:46:49 +00:00
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>
This commit is contained in:
@@ -412,10 +412,12 @@ abstract class TutorialController implements BackGestureAttemptCallback,
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
Reference in New Issue
Block a user