From fb552936fd10c04071134650a8e39fcdcf681ce1 Mon Sep 17 00:00:00 2001 From: Schneider Victor-tulias Date: Fri, 12 Mar 2021 15:50:58 -0800 Subject: [PATCH] Complete gesture nav sandbox for for UXR. - Removed All set screens altogether. - Added "x" button to feedback view. This button now launches a dialog that allows the user to skip the tutorial. - Added a progress tracker to the feedback view. - Created a launch option to launch the back, home, then overview gesture tutorials in order. - Added a button in the feedback view to progress through the tutorial. - Updated tutorial animations to AnimatedVectorDrawables (with green accents). Bug: 148542211 Test: manual Change-Id: Icf3ec424141069895f97da74cd4ae881ff898d3f --- .../res/drawable/bg_sandbox_close_button.xml | 5 + .../res/drawable/bg_sandbox_feedback.xml | 30 +- quickstep/res/drawable/close_icon.xml | 10 + ...ture_tutorial_action_button_background.xml | 2 +- .../drawable/gesture_tutorial_back_left.xml | 559 ++++++++++++ .../drawable/gesture_tutorial_back_right.xml | 561 ++++++++++++ ...ture_tutorial_cancel_button_background.xml | 21 + .../res/drawable/gesture_tutorial_home.xml | 394 +++++++++ .../drawable/gesture_tutorial_overview.xml | 823 ++++++++++++++++++ .../res/layout/gesture_tutorial_dialog.xml | 74 ++ .../res/layout/gesture_tutorial_fragment.xml | 144 ++- quickstep/res/raw/tips_nav_back_left.mp4 | Bin 485479 -> 0 bytes quickstep/res/raw/tips_nav_back_right.mp4 | Bin 472301 -> 0 bytes quickstep/res/raw/tips_nav_home.mp4 | Bin 585968 -> 0 bytes quickstep/res/raw/tips_nav_overview.mp4 | Bin 991554 -> 0 bytes quickstep/res/values/strings.xml | 2 +- quickstep/res/values/styles.xml | 28 + .../AssistantGestureTutorialController.java | 37 +- .../BackGestureTutorialController.java | 61 +- .../BackGestureTutorialFragment.java | 4 +- .../interaction/GestureSandboxActivity.java | 33 +- .../HomeGestureTutorialController.java | 30 +- .../HomeGestureTutorialFragment.java | 2 +- .../OverviewGestureTutorialController.java | 28 +- .../OverviewGestureTutorialFragment.java | 2 +- .../SandboxModeTutorialController.java | 20 - .../interaction/TutorialController.java | 284 ++++-- .../interaction/TutorialFragment.java | 110 ++- res/values/colors.xml | 4 +- .../settings/DeveloperOptionsFragment.java | 14 + 30 files changed, 2901 insertions(+), 381 deletions(-) create mode 100644 quickstep/res/drawable/bg_sandbox_close_button.xml create mode 100644 quickstep/res/drawable/close_icon.xml create mode 100644 quickstep/res/drawable/gesture_tutorial_back_left.xml create mode 100644 quickstep/res/drawable/gesture_tutorial_back_right.xml create mode 100644 quickstep/res/drawable/gesture_tutorial_cancel_button_background.xml create mode 100644 quickstep/res/drawable/gesture_tutorial_home.xml create mode 100644 quickstep/res/drawable/gesture_tutorial_overview.xml create mode 100644 quickstep/res/layout/gesture_tutorial_dialog.xml delete mode 100644 quickstep/res/raw/tips_nav_back_left.mp4 delete mode 100644 quickstep/res/raw/tips_nav_back_right.mp4 delete mode 100644 quickstep/res/raw/tips_nav_home.mp4 delete mode 100644 quickstep/res/raw/tips_nav_overview.mp4 diff --git a/quickstep/res/drawable/bg_sandbox_close_button.xml b/quickstep/res/drawable/bg_sandbox_close_button.xml new file mode 100644 index 0000000000..2811071dd2 --- /dev/null +++ b/quickstep/res/drawable/bg_sandbox_close_button.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/quickstep/res/drawable/bg_sandbox_feedback.xml b/quickstep/res/drawable/bg_sandbox_feedback.xml index 1b3265dbd5..83a3deada8 100644 --- a/quickstep/res/drawable/bg_sandbox_feedback.xml +++ b/quickstep/res/drawable/bg_sandbox_feedback.xml @@ -1,10 +1,20 @@ - - - + + + + + diff --git a/quickstep/res/drawable/close_icon.xml b/quickstep/res/drawable/close_icon.xml new file mode 100644 index 0000000000..07f4336882 --- /dev/null +++ b/quickstep/res/drawable/close_icon.xml @@ -0,0 +1,10 @@ + + + diff --git a/quickstep/res/drawable/gesture_tutorial_action_button_background.xml b/quickstep/res/drawable/gesture_tutorial_action_button_background.xml index 3f3b288e2d..6fc2b7657a 100644 --- a/quickstep/res/drawable/gesture_tutorial_action_button_background.xml +++ b/quickstep/res/drawable/gesture_tutorial_action_button_background.xml @@ -15,6 +15,6 @@ --> - + \ No newline at end of file diff --git a/quickstep/res/drawable/gesture_tutorial_back_left.xml b/quickstep/res/drawable/gesture_tutorial_back_left.xml new file mode 100644 index 0000000000..92ae2025fb --- /dev/null +++ b/quickstep/res/drawable/gesture_tutorial_back_left.xml @@ -0,0 +1,559 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/quickstep/res/drawable/gesture_tutorial_back_right.xml b/quickstep/res/drawable/gesture_tutorial_back_right.xml new file mode 100644 index 0000000000..77d9924524 --- /dev/null +++ b/quickstep/res/drawable/gesture_tutorial_back_right.xml @@ -0,0 +1,561 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/quickstep/res/drawable/gesture_tutorial_cancel_button_background.xml b/quickstep/res/drawable/gesture_tutorial_cancel_button_background.xml new file mode 100644 index 0000000000..0a34af6475 --- /dev/null +++ b/quickstep/res/drawable/gesture_tutorial_cancel_button_background.xml @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/quickstep/res/drawable/gesture_tutorial_home.xml b/quickstep/res/drawable/gesture_tutorial_home.xml new file mode 100644 index 0000000000..e77eb7401f --- /dev/null +++ b/quickstep/res/drawable/gesture_tutorial_home.xml @@ -0,0 +1,394 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/quickstep/res/drawable/gesture_tutorial_overview.xml b/quickstep/res/drawable/gesture_tutorial_overview.xml new file mode 100644 index 0000000000..c4ca72f5a1 --- /dev/null +++ b/quickstep/res/drawable/gesture_tutorial_overview.xml @@ -0,0 +1,823 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/quickstep/res/layout/gesture_tutorial_dialog.xml b/quickstep/res/layout/gesture_tutorial_dialog.xml new file mode 100644 index 0000000000..59bf7b965c --- /dev/null +++ b/quickstep/res/layout/gesture_tutorial_dialog.xml @@ -0,0 +1,74 @@ + + + + + + + + +