From bfe822f6422511c5f48e1d8bf150f5db928ddacd Mon Sep 17 00:00:00 2001
From: mincheli <mincheli@google.com>
Date: Mon, 10 May 2021 11:54:59 +0800
Subject: [PATCH] Adjusts measurement for magnification switch and drag handle

Update the dimension and color values.
https://markup.googleplex.com/projects/5619/v/latest/artboard/101-382/measurements?mode=preview

Bug: 185288922
Test: none
Change-Id: I3ddb40d95c86d742fb2268f932918f2cc367e551
---
 packages/SystemUI/res/drawable/ic_move_magnification.xml   | 6 +++---
 .../SystemUI/res/drawable/ic_open_in_new_fullscreen.xml    | 7 ++++---
 packages/SystemUI/res/drawable/ic_open_in_new_window.xml   | 7 ++++---
 packages/SystemUI/res/layout/window_magnifier_view.xml     | 2 +-
 packages/SystemUI/res/values/colors.xml                    | 1 +
 packages/SystemUI/res/values/dimens.xml                    | 4 ++--
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/packages/SystemUI/res/drawable/ic_move_magnification.xml b/packages/SystemUI/res/drawable/ic_move_magnification.xml
index 642fc315efccf..96db3651ac256 100644
--- a/packages/SystemUI/res/drawable/ic_move_magnification.xml
+++ b/packages/SystemUI/res/drawable/ic_move_magnification.xml
@@ -19,7 +19,7 @@
     <item>
         <shape android:shape="rectangle">
             <solid
-                android:color="@color/magnification_switch_button_color" />
+                android:color="@color/magnification_drag_handle_color" />
             <size
                 android:height="@dimen/magnification_drag_view_size"
                 android:width="@dimen/magnification_drag_view_size"/>
@@ -28,8 +28,8 @@
     <item
         android:gravity="center">
         <vector xmlns:android="http://schemas.android.com/apk/res/android"
-            android:width="24dp"
-            android:height="24dp"
+            android:width="30dp"
+            android:height="30dp"
             android:viewportWidth="24"
             android:viewportHeight="24">
             <path
diff --git a/packages/SystemUI/res/drawable/ic_open_in_new_fullscreen.xml b/packages/SystemUI/res/drawable/ic_open_in_new_fullscreen.xml
index 5bb7390d660f9..36a1224a78c9a 100644
--- a/packages/SystemUI/res/drawable/ic_open_in_new_fullscreen.xml
+++ b/packages/SystemUI/res/drawable/ic_open_in_new_fullscreen.xml
@@ -24,10 +24,11 @@
         </shape>
     </item>
 
-    <item>
+    <item
+        android:gravity="center">
         <vector
-            android:width="24dp"
-            android:height="24dp"
+            android:width="36dp"
+            android:height="36dp"
             android:viewportWidth="24"
             android:viewportHeight="24">
             <group>
diff --git a/packages/SystemUI/res/drawable/ic_open_in_new_window.xml b/packages/SystemUI/res/drawable/ic_open_in_new_window.xml
index 2d8a5d95825bb..f41f784317887 100644
--- a/packages/SystemUI/res/drawable/ic_open_in_new_window.xml
+++ b/packages/SystemUI/res/drawable/ic_open_in_new_window.xml
@@ -24,10 +24,11 @@
         </shape>
     </item>
 
-    <item>
+    <item
+        android:gravity="center">
         <vector
-            android:width="24dp"
-            android:height="24dp"
+            android:width="36dp"
+            android:height="36dp"
             android:viewportWidth="24"
             android:viewportHeight="24">
             <path
diff --git a/packages/SystemUI/res/layout/window_magnifier_view.xml b/packages/SystemUI/res/layout/window_magnifier_view.xml
index 96de5a91f37cd..ae16e5c919c42 100644
--- a/packages/SystemUI/res/layout/window_magnifier_view.xml
+++ b/packages/SystemUI/res/layout/window_magnifier_view.xml
@@ -75,7 +75,7 @@
         android:id="@+id/drag_handle"
         android:layout_width="@dimen/magnification_drag_view_size"
         android:layout_height="@dimen/magnification_drag_view_size"
-        android:layout_margin="@dimen/magnification_outer_border_margin"
+        android:layout_margin="@dimen/magnification_inner_border_margin"
         android:layout_gravity="right|bottom"
         android:paddingEnd="@dimen/magnifier_drag_handle_padding"
         android:paddingBottom="@dimen/magnifier_drag_handle_padding"
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index 08a2e196214c2..8a880750ed236 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -247,6 +247,7 @@
     <!-- Window magnification colors -->
     <color name="magnification_border_color">#FF9900</color>
     <color name="magnification_switch_button_color">#7F000000</color>
+    <color name="magnification_drag_handle_color">#B3000000</color>
 
     <!-- Volume dialog colors -->
     <color name="volume_dialog_background_color">@android:color/transparent</color>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 7e56063b2d0d3..815de6beeff41 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -1292,9 +1292,9 @@
     <dimen name="magnification_mirror_surface_margin">20dp</dimen>
     <dimen name="magnification_frame_move_short">5dp</dimen>
     <dimen name="magnification_frame_move_long">25dp</dimen>
-    <dimen name="magnification_drag_view_size">38dp</dimen>
+    <dimen name="magnification_drag_view_size">36dp</dimen>
     <dimen name="magnification_controls_size">90dp</dimen>
-    <dimen name="magnification_switch_button_size">60dp</dimen>
+    <dimen name="magnification_switch_button_size">48dp</dimen>
     <dimen name="magnification_switch_button_padding">6dp</dimen>
     <dimen name="magnifier_left_right_controls_width">35dp</dimen>
     <dimen name="magnifier_left_right_controls_height">45dp</dimen>