From 9909544c8a575d82b31bed71fb8d77960bd806ff Mon Sep 17 00:00:00 2001 From: Schneider Victor-tulias Date: Tue, 25 May 2021 12:34:47 -0700 Subject: [PATCH] Update gesture nav colors and animation for dark/light theming - Added light mode gesture feedback animations - Added color resources for the fake launcher wallpaper. Also using these color resources in the feedback animations for consistency - Using fake previous app task color in feedback animations for consistency Bug: 169687177 Test: manual Change-Id: I1d28212e02c2ae750ce6241b64aa90f52b827c76 --- ...ture_tutorial_action_button_background.xml | 21 +- ...e_tutorial_motion_back_left_dark_mode.xml} | 0 ...e_tutorial_motion_back_left_light_mode.xml | 1412 +++++++++++++++ ..._tutorial_motion_back_right_dark_mode.xml} | 0 ..._tutorial_motion_back_right_light_mode.xml | 1413 +++++++++++++++ ...esture_tutorial_motion_home_dark_mode.xml} | 2 +- ...esture_tutorial_motion_home_light_mode.xml | 1254 +++++++++++++ ...re_tutorial_motion_overview_dark_mode.xml} | 4 +- ...webpage.xml => mock_webpage_dark_mode.xml} | 0 .../res/drawable/mock_webpage_light_mode.xml | 263 +++ .../res/layout/gesture_tutorial_fragment.xml | 22 +- .../BackGestureTutorialController.java | 2 +- .../BackGestureTutorialFragment.java | 10 +- .../HomeGestureTutorialController.java | 4 +- .../HomeGestureTutorialFragment.java | 6 +- .../OverviewGestureTutorialController.java | 2 +- .../OverviewGestureTutorialFragment.java | 6 +- .../SwipeUpGestureTutorialController.java | 6 +- .../interaction/TutorialController.java | 23 +- .../interaction/TutorialFragment.java | 11 +- ...re_tutorial_motion_overview_light_mode.xml | 1587 +++++++++++++++++ res/values/colors.xml | 3 + 22 files changed, 6009 insertions(+), 42 deletions(-) rename quickstep/res/drawable/{gesture_tutorial_motion_back_left.xml => gesture_tutorial_motion_back_left_dark_mode.xml} (100%) create mode 100644 quickstep/res/drawable/gesture_tutorial_motion_back_left_light_mode.xml rename quickstep/res/drawable/{gesture_tutorial_motion_back_right.xml => gesture_tutorial_motion_back_right_dark_mode.xml} (100%) create mode 100644 quickstep/res/drawable/gesture_tutorial_motion_back_right_light_mode.xml rename quickstep/res/drawable/{gesture_tutorial_motion_home.xml => gesture_tutorial_motion_home_dark_mode.xml} (99%) create mode 100644 quickstep/res/drawable/gesture_tutorial_motion_home_light_mode.xml rename quickstep/res/drawable/{gesture_tutorial_motion_overview.xml => gesture_tutorial_motion_overview_dark_mode.xml} (99%) rename quickstep/res/drawable/{mock_webpage.xml => mock_webpage_dark_mode.xml} (100%) create mode 100644 quickstep/res/drawable/mock_webpage_light_mode.xml create mode 100644 res/drawable/gesture_tutorial_motion_overview_light_mode.xml diff --git a/quickstep/res/drawable/gesture_tutorial_action_button_background.xml b/quickstep/res/drawable/gesture_tutorial_action_button_background.xml index 6fc2b7657a..ac6a52a623 100644 --- a/quickstep/res/drawable/gesture_tutorial_action_button_background.xml +++ b/quickstep/res/drawable/gesture_tutorial_action_button_background.xml @@ -13,8 +13,19 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - \ No newline at end of file + + + + + + + + + + + + + \ 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_left_dark_mode.xml similarity index 100% rename from quickstep/res/drawable/gesture_tutorial_motion_back_left.xml rename to quickstep/res/drawable/gesture_tutorial_motion_back_left_dark_mode.xml diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_left_light_mode.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_left_light_mode.xml new file mode 100644 index 0000000000..c0eafda4e9 --- /dev/null +++ b/quickstep/res/drawable/gesture_tutorial_motion_back_left_light_mode.xml @@ -0,0 +1,1412 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_right.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_right_dark_mode.xml similarity index 100% rename from quickstep/res/drawable/gesture_tutorial_motion_back_right.xml rename to quickstep/res/drawable/gesture_tutorial_motion_back_right_dark_mode.xml diff --git a/quickstep/res/drawable/gesture_tutorial_motion_back_right_light_mode.xml b/quickstep/res/drawable/gesture_tutorial_motion_back_right_light_mode.xml new file mode 100644 index 0000000000..c24e5a5012 --- /dev/null +++ b/quickstep/res/drawable/gesture_tutorial_motion_back_right_light_mode.xml @@ -0,0 +1,1413 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/quickstep/res/drawable/gesture_tutorial_motion_home.xml b/quickstep/res/drawable/gesture_tutorial_motion_home_dark_mode.xml similarity index 99% rename from quickstep/res/drawable/gesture_tutorial_motion_home.xml rename to quickstep/res/drawable/gesture_tutorial_motion_home_dark_mode.xml index 87b885715c..aff35c1bce 100644 --- a/quickstep/res/drawable/gesture_tutorial_motion_home.xml +++ b/quickstep/res/drawable/gesture_tutorial_motion_home_dark_mode.xml @@ -922,7 +922,7 @@ diff --git a/quickstep/res/drawable/gesture_tutorial_motion_home_light_mode.xml b/quickstep/res/drawable/gesture_tutorial_motion_home_light_mode.xml new file mode 100644 index 0000000000..98d97ad62d --- /dev/null +++ b/quickstep/res/drawable/gesture_tutorial_motion_home_light_mode.xml @@ -0,0 +1,1254 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/quickstep/res/drawable/gesture_tutorial_motion_overview.xml b/quickstep/res/drawable/gesture_tutorial_motion_overview_dark_mode.xml similarity index 99% rename from quickstep/res/drawable/gesture_tutorial_motion_overview.xml rename to quickstep/res/drawable/gesture_tutorial_motion_overview_dark_mode.xml index 058bee2ef0..b007d20f34 100644 --- a/quickstep/res/drawable/gesture_tutorial_motion_overview.xml +++ b/quickstep/res/drawable/gesture_tutorial_motion_overview_dark_mode.xml @@ -860,7 +860,7 @@ @@ -1600,7 +1600,7 @@ diff --git a/quickstep/res/drawable/mock_webpage.xml b/quickstep/res/drawable/mock_webpage_dark_mode.xml similarity index 100% rename from quickstep/res/drawable/mock_webpage.xml rename to quickstep/res/drawable/mock_webpage_dark_mode.xml diff --git a/quickstep/res/drawable/mock_webpage_light_mode.xml b/quickstep/res/drawable/mock_webpage_light_mode.xml new file mode 100644 index 0000000000..98abb92ab7 --- /dev/null +++ b/quickstep/res/drawable/mock_webpage_light_mode.xml @@ -0,0 +1,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 a884e745e2..1e8d0e03d3 100644 --- a/quickstep/res/layout/gesture_tutorial_fragment.xml +++ b/quickstep/res/layout/gesture_tutorial_fragment.xml @@ -20,13 +20,20 @@ android:layout_height="match_parent" android:clipChildren="false"> - + android:layout_width="match_parent" + android:layout_height="match_parent"> + + + + -