From bfe33b057a1c51f24b45ead18c9e7e27caed4fb0 Mon Sep 17 00:00:00 2001 From: Schneider Victor-tulias Date: Thu, 24 Jun 2021 15:05:18 -0700 Subject: [PATCH] Update Gesture navigation tutorial to match new specs - Updated strings - Updated removed 'next' button when there are followign steps - Added timeout to automatically continue the tutorial - Combined back left and right into one step Bug: 192009114 Bug: 177005427 Test: manual Change-Id: I58b9017c4d69b5d097326c7d5be156a63951fb1a --- ...eft.xml => gesture_tutorial_loop_back.xml} | 0 .../gesture_tutorial_loop_back_right.xml | 96 -- ...t.xml => gesture_tutorial_motion_back.xml} | 0 .../gesture_tutorial_motion_back_right.xml | 1233 ----------------- .../drawable/tutorial_step_indicator_pill.xml | 2 +- .../res/layout/gesture_tutorial_fragment.xml | 36 +- quickstep/res/values/strings.xml | 32 +- quickstep/res/values/styles.xml | 4 +- .../BackGestureTutorialController.java | 56 +- .../BackGestureTutorialFragment.java | 8 +- .../interaction/GestureSandboxActivity.java | 2 +- .../HomeGestureTutorialController.java | 1 - .../SandboxModeTutorialController.java | 6 +- .../interaction/TutorialController.java | 35 +- .../interaction/TutorialFragment.java | 5 +- .../settings/DeveloperOptionsFragment.java | 5 +- 16 files changed, 87 insertions(+), 1434 deletions(-) rename quickstep/res/drawable/{gesture_tutorial_loop_back_left.xml => gesture_tutorial_loop_back.xml} (100%) delete mode 100644 quickstep/res/drawable/gesture_tutorial_loop_back_right.xml rename quickstep/res/drawable/{gesture_tutorial_motion_back_left.xml => gesture_tutorial_motion_back.xml} (100%) delete mode 100644 quickstep/res/drawable/gesture_tutorial_motion_back_right.xml 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"/>