diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 3b8278451d..6d0dbaea9f 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -98,16 +98,17 @@
Rotate your device
Please rotate your device to complete the gesture navigation tutorial
+
- Make sure you swipe from the far-right or far-left edge.
+ Make sure you swipe from the far-right or far-left edge
- Make sure you swipe from the right or left edge to the middle of the screen and let go.
+ Make sure you swipe from the right or left edge to the middle of the screen and let go
You learned how to swipe from the right to go back. Next up, learn how to switch apps.
- You completed the go back gesture.
+ You completed the go back gesture
- Make sure you don\'t swipe too close to the bottom of the screen.
+ Make sure you don\'t swipe too close to the bottom of the screen
To change the sensitivity of the back gesture, go to Settings
@@ -119,16 +120,18 @@
To go back to the last screen, swipe with 2 fingers from the left or right edge to the middle of the screen.
Go back
+
+ Swipe from the left or right edge to the middle of the screen
- Make sure you swipe up from the bottom edge of the screen.
+ Make sure you swipe up from the bottom edge of the screen
- Make sure you don\'t pause before letting go.
+ Make sure you don\'t pause before letting go
- Make sure you swipe straight up.
+ Make sure you swipe straight up
- You completed the go Home gesture. Next up, learn how to go back.
+ You completed the go home gesture. Next up, learn how to go back.
- You completed the go Home gesture.
+ You completed the go home gesture
Swipe to go home
@@ -138,18 +141,20 @@
Go home
- To go to your home screen at any time, swipe up from the bottom of your screen
+ Swipe up from the bottom of your screen
+
+ Great job!
- Make sure you swipe up from the bottom edge of the screen.
+ Make sure you swipe up from the bottom edge of the screen
- Try holding the window for longer before releasing.
+ Try holding the window for longer before releasing
- Make sure you swipe straight up, then pause.
+ Make sure you swipe straight up, then pause
You learned how to use gestures. To turn off gestures, go to Settings.
- You completed the switch apps gesture.
+ You completed the switch apps gesture
Swipe to switch apps
@@ -158,6 +163,11 @@
To switch between apps, swipe up with 2 fingers from the bottom of your screen, hold, then release.
Switch apps
+
+ Swipe up from the bottom of your screen, hold, then release
+
+ Well done!
+
Tutorial: Assistant
diff --git a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
index 9083d514d3..5d2527973e 100644
--- a/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
@@ -66,7 +66,9 @@ final class BackGestureTutorialController extends TutorialController {
@Override
public int getIntroductionSubtitle() {
- return R.string.back_gesture_intro_subtitle;
+ return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
+ ? R.string.back_gesture_tutorial_subtitle
+ : R.string.back_gesture_intro_subtitle;
}
@Override
@@ -74,6 +76,11 @@ final class BackGestureTutorialController extends TutorialController {
return R.string.back_gesture_spoken_intro_subtitle;
}
+ @Override
+ public int getSuccessFeedbackTitle() {
+ return R.string.gesture_tutorial_nice;
+ }
+
@Override
public int getSuccessFeedbackSubtitle() {
return mTutorialFragment.isAtFinalStep()
diff --git a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
index 333ecbbb2c..bce8b985af 100644
--- a/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
@@ -73,6 +73,13 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
return R.string.home_gesture_spoken_intro_subtitle;
}
+ @Override
+ public int getSuccessFeedbackTitle() {
+ return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
+ ? R.string.home_gesture_tutorial_success
+ : R.string.gesture_tutorial_nice;
+ }
+
@Override
public int getSuccessFeedbackSubtitle() {
return mTutorialFragment.isAtFinalStep()
diff --git a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
index 09a6bbe6b2..454dd17f37 100644
--- a/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
@@ -77,7 +77,9 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
@Override
public int getIntroductionSubtitle() {
- return R.string.overview_gesture_intro_subtitle;
+ return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
+ ? R.string.overview_gesture_tutorial_subtitle
+ : R.string.overview_gesture_intro_subtitle;
}
@Override
@@ -85,6 +87,13 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
return R.string.overview_gesture_spoken_intro_subtitle;
}
+ @Override
+ public int getSuccessFeedbackTitle() {
+ return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
+ ? R.string.overview_gesture_tutorial_success
+ : R.string.gesture_tutorial_nice;
+ }
+
@Override
public int getSuccessFeedbackSubtitle() {
return mTutorialFragment.getNumSteps() > 1 && mTutorialFragment.isAtFinalStep()
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index a58f4538c8..c29fa6427b 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -321,6 +321,11 @@ abstract class TutorialController implements BackGestureAttemptCallback,
return NO_ID;
}
+ @StringRes
+ public int getSuccessFeedbackTitle() {
+ return NO_ID;
+ }
+
@StyleRes
public int getTitleTextAppearance() {
return NO_ID;
@@ -392,7 +397,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
void showFeedback(int subtitleResId, boolean isGestureSuccessful) {
showFeedback(
isGestureSuccessful
- ? R.string.gesture_tutorial_nice : R.string.gesture_tutorial_try_again,
+ ? getSuccessFeedbackTitle() : R.string.gesture_tutorial_try_again,
subtitleResId,
NO_ID,
isGestureSuccessful,