From 03d7ba5be3df19e061de4044a11912205dd0db73 Mon Sep 17 00:00:00 2001 From: Massimo Carli Date: Fri, 24 Mar 2023 16:18:21 +0000 Subject: [PATCH] CompatUI UX Improvements This CL does the following UX improvements: - Increase fading animation duration to 400ms - Implement a logic for horizontal and vertical education indipendently which displays icons when in center position only once and every time user double-taps for a not-central position. - Remove the circles animation Bug: 275054578 Test: atest WMShellUnitTests:ReachabilityEduLayoutTest atest WMShellUnitTests:LetterboxEduWindowManagerTest atest WMShellUnitTests:ReachabilityEduWindowManagerTest Change-Id: I55cd13c83f43a8a31725e6f6493504bc3ab4e62e --- .../reachability_education_ic_left_hand.xml | 695 +----------------- .../reachability_education_ic_right_hand.xml | 693 +---------------- .../res/layout/reachability_ui_layout.xml | 12 +- .../WindowManager/Shell/res/values/colors.xml | 3 - libs/WindowManager/Shell/res/values/dimen.xml | 3 - .../WindowManager/Shell/res/values/styles.xml | 4 +- .../shell/compatui/CompatUIConfiguration.java | 71 +- .../wm/shell/compatui/CompatUIController.java | 11 +- .../compatui/ReachabilityEduHandLayout.java | 66 -- .../shell/compatui/ReachabilityEduLayout.java | 181 +++-- .../ReachabilityEduWindowManager.java | 57 +- .../compatui/ReachabilityEduLayoutTest.java | 46 +- .../ReachabilityEduWindowManagerTest.java | 5 +- 13 files changed, 235 insertions(+), 1612 deletions(-) delete mode 100644 libs/WindowManager/Shell/src/com/android/wm/shell/compatui/ReachabilityEduHandLayout.java diff --git a/libs/WindowManager/Shell/res/drawable/reachability_education_ic_left_hand.xml b/libs/WindowManager/Shell/res/drawable/reachability_education_ic_left_hand.xml index c400dc676325b..029d838811656 100644 --- a/libs/WindowManager/Shell/res/drawable/reachability_education_ic_left_hand.xml +++ b/libs/WindowManager/Shell/res/drawable/reachability_education_ic_left_hand.xml @@ -14,686 +14,15 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/reachability_education_ic_right_hand.xml b/libs/WindowManager/Shell/res/drawable/reachability_education_ic_right_hand.xml index a807a770aa221..592f899d2ecce 100644 --- a/libs/WindowManager/Shell/res/drawable/reachability_education_ic_right_hand.xml +++ b/libs/WindowManager/Shell/res/drawable/reachability_education_ic_right_hand.xml @@ -14,686 +14,13 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/libs/WindowManager/Shell/res/layout/reachability_ui_layout.xml b/libs/WindowManager/Shell/res/layout/reachability_ui_layout.xml index 1e36fb62f8da0..49491a7b572c3 100644 --- a/libs/WindowManager/Shell/res/layout/reachability_ui_layout.xml +++ b/libs/WindowManager/Shell/res/layout/reachability_ui_layout.xml @@ -22,48 +22,44 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - diff --git a/libs/WindowManager/Shell/res/values/colors.xml b/libs/WindowManager/Shell/res/values/colors.xml index 7d5760e471890..6fb70006e67f2 100644 --- a/libs/WindowManager/Shell/res/values/colors.xml +++ b/libs/WindowManager/Shell/res/values/colors.xml @@ -45,9 +45,6 @@ @android:color/system_neutral1_900 - - #BFC8CC - #E8EAED #5F6368 diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml index 04b53f266a099..9fd16461fa01d 100644 --- a/libs/WindowManager/Shell/res/values/dimen.xml +++ b/libs/WindowManager/Shell/res/values/dimen.xml @@ -330,9 +330,6 @@ 16dp - - 118dp - 24dp diff --git a/libs/WindowManager/Shell/res/values/styles.xml b/libs/WindowManager/Shell/res/values/styles.xml index d0782ad9b37e7..6e1185559a50b 100644 --- a/libs/WindowManager/Shell/res/values/styles.xml +++ b/libs/WindowManager/Shell/res/values/styles.xml @@ -145,7 +145,7 @@ -