diff --git a/quickstep/res/drawable/gesture_tutorial_loop_back_left.xml b/quickstep/res/drawable/gesture_tutorial_loop_back.xml
similarity index 100%
rename from quickstep/res/drawable/gesture_tutorial_loop_back_left.xml
rename to quickstep/res/drawable/gesture_tutorial_loop_back.xml
diff --git a/quickstep/res/drawable/gesture_tutorial_loop_back_right.xml b/quickstep/res/drawable/gesture_tutorial_loop_back_right.xml
deleted file mode 100644
index c20b252778..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_loop_back_right.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_left.xml b/quickstep/res/drawable/gesture_tutorial_motion_back.xml
similarity index 100%
rename from quickstep/res/drawable/gesture_tutorial_motion_back_left.xml
rename to quickstep/res/drawable/gesture_tutorial_motion_back.xml
diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml
deleted file mode 100644
index b368d9d045..0000000000
--- a/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml
+++ /dev/null
@@ -1,1233 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/quickstep/res/drawable/tutorial_step_indicator_pill.xml b/quickstep/res/drawable/tutorial_step_indicator_pill.xml
index 94a8748e64..d4e8f84cfb 100644
--- a/quickstep/res/drawable/tutorial_step_indicator_pill.xml
+++ b/quickstep/res/drawable/tutorial_step_indicator_pill.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/quickstep/res/layout/gesture_tutorial_fragment.xml b/quickstep/res/layout/gesture_tutorial_fragment.xml
index 1e8d0e03d3..cdda43c8a8 100644
--- a/quickstep/res/layout/gesture_tutorial_fragment.xml
+++ b/quickstep/res/layout/gesture_tutorial_fragment.xml
@@ -92,7 +92,8 @@
android:layout_marginStart="@dimen/gesture_tutorial_feedback_margin_start_end"
android:layout_marginEnd="@dimen/gesture_tutorial_feedback_margin_start_end"
android:layout_marginTop="24dp"
- android:padding="24dp"
+ android:paddingTop="24dp"
+ android:paddingBottom="16dp"
android:background="@drawable/bg_sandbox_feedback">
+ app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_fragment_feedback_subtitle"
+ app:layout_constraintEnd_toEndOf="parent"/>
+ app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_fragment_feedback_subtitle"
+ app:layout_constraintStart_toStartOf="parent"/>
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 281f735f8f..4aee2a9ccb 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -91,16 +91,10 @@
Predicted app: %1$s
-
- Make sure you swipe from the far-left edge.
-
- Make sure you swipe from the left edge to the middle of the screen and let go.
- Make sure you swipe from the far-right edge.
+ Make sure you swipe from the far-right or far-left edge.
- Make sure you swipe from the right edge to the middle of the screen and let go.
-
- You learned how to swipe from the left to go back.
+ 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.
@@ -110,14 +104,10 @@
To change the sensitivity of the back gesture, go to Settings
-
- Swipe from the left to go back
-
- Swipe from the right to go back
-
- To go back to the last screen you were on, swipe from the left edge to the middle of the screen.
-
- You can also go back to the last screen by swiping from the right edge to the middle of the screen. Try it now.
+
+ Swipe to go back
+
+ To go back to the last screen, 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.
@@ -146,7 +136,7 @@
Swipe to switch apps
- Swipe up from the bottom of your screen, hold, then release.
+ To switch between apps, swipe up from the bottom of your screen, hold, then release.
Tutorial: Assistant
@@ -176,8 +166,8 @@
All set
-
- Next
+
+ Done
Settings
@@ -190,11 +180,11 @@
All set!
- Swipe up to go home
+ Swipe up to go Home
You\u2019re ready to start using your phone
- Navigation settings for accessibility
+ System navigation settings
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index ca1e8c835e..07c448df9e 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -41,10 +41,10 @@
parent="TextAppearance.GestureTutorial">
- start
- ?android:attr/textColorPrimary
- - google-sans-display
+ - google-sans-regular
- 0.03
- 36sp
- - 42sp
+ - 44sp