From fd79b4dfbdcc33507bc6f7e25e14d0c421c11dcb Mon Sep 17 00:00:00 2001 From: Saumya Prakash Date: Fri, 3 Mar 2023 23:03:51 +0000 Subject: [PATCH] Redesign the gesture tutorial for the Back gesture This change adds in a new animation and layout to change the existing back tutorial as part of the effort to redesign gesture navigation education for users. This temporarily uses placeholder animations for the overview gesture. Large screen animations are also added for Home and Back tutorial. Flag: ENABLE_NEW_GESTURE_NAV_TUTORIAL Bug: 241813570 Bug: 253521922 Bug: 253520701 Test: Manual Change-Id: Ied18b88a83a3b673a7cf40fd33b6013f24998e44 --- quickstep/AndroidManifest.xml | 1 + ...designed_gesture_tutorial_mock_hotseat.xml | 70 ++++++++++++++++ .../back_gesture_tutorial_background.xml | 18 +++++ .../redesigned_gesture_tutorial_fragment.xml | 38 +++++---- .../raw/back_gesture_tutorial_animation.json | 1 + ...ack_gesture_tutorial_tablet_animation.json | 1 + .../res/raw/checkmark_animation_end.json | 1 + .../raw/checkmark_animation_in_progress.json | 1 + ...ome_gesture_tutorial_tablet_animation.json | 1 + quickstep/res/values/colors.xml | 4 +- quickstep/res/values/dimens.xml | 2 + quickstep/res/values/strings.xml | 2 + quickstep/res/values/styles.xml | 5 ++ .../BackGestureTutorialController.java | 81 ++++++++++++++++--- .../interaction/EdgeBackGestureHandler.java | 11 ++- .../HomeGestureTutorialController.java | 4 +- .../interaction/TutorialController.java | 69 ++++++++++++++-- .../interaction/TutorialFragment.java | 1 - 18 files changed, 268 insertions(+), 43 deletions(-) create mode 100644 quickstep/res/layout-land/redesigned_gesture_tutorial_mock_hotseat.xml create mode 100644 quickstep/res/layout/back_gesture_tutorial_background.xml create mode 100644 quickstep/res/raw/back_gesture_tutorial_animation.json create mode 100644 quickstep/res/raw/back_gesture_tutorial_tablet_animation.json create mode 100644 quickstep/res/raw/checkmark_animation_end.json create mode 100644 quickstep/res/raw/checkmark_animation_in_progress.json create mode 100644 quickstep/res/raw/home_gesture_tutorial_tablet_animation.json diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml index 3647e05f0a..8e1baba956 100644 --- a/quickstep/AndroidManifest.xml +++ b/quickstep/AndroidManifest.xml @@ -103,6 +103,7 @@ diff --git a/quickstep/res/layout-land/redesigned_gesture_tutorial_mock_hotseat.xml b/quickstep/res/layout-land/redesigned_gesture_tutorial_mock_hotseat.xml new file mode 100644 index 0000000000..6c08d14b6b --- /dev/null +++ b/quickstep/res/layout-land/redesigned_gesture_tutorial_mock_hotseat.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/quickstep/res/layout/back_gesture_tutorial_background.xml b/quickstep/res/layout/back_gesture_tutorial_background.xml new file mode 100644 index 0000000000..7fa2cf507a --- /dev/null +++ b/quickstep/res/layout/back_gesture_tutorial_background.xml @@ -0,0 +1,18 @@ + + + diff --git a/quickstep/res/layout/redesigned_gesture_tutorial_fragment.xml b/quickstep/res/layout/redesigned_gesture_tutorial_fragment.xml index 13482acbc8..43439c693e 100644 --- a/quickstep/res/layout/redesigned_gesture_tutorial_fragment.xml +++ b/quickstep/res/layout/redesigned_gesture_tutorial_fragment.xml @@ -118,6 +118,14 @@ android:scaleType="fitXY" android:visibility="gone" /> + + - - -