From dcb42fe92def72bae6945080b4316911a13bbe2e Mon Sep 17 00:00:00 2001
From: Aran Ink <nesciosquid@google.com>
Date: Fri, 15 May 2020 14:16:12 -0400
Subject: [PATCH] Adjust GlobalActions power item layout to adapt to size
 changes.

These changes make the items somewhat more resilient to changes in screen and text size.

Test: Visual -- layout is legible and reasonably consistent across a wide range of font and display sizes.
Fixes: 154758354
Fixes: 154758242
Change-Id: Ib3bf5b931ad808675d075a902067d21ad35dc057
---
 .../layout/global_actions_grid_item_v2.xml    | 44 ++++++-------------
 1 file changed, 14 insertions(+), 30 deletions(-)

diff --git a/packages/SystemUI/res/layout/global_actions_grid_item_v2.xml b/packages/SystemUI/res/layout/global_actions_grid_item_v2.xml
index 477ec6a1c72cb..1b42ceb50bf71 100644
--- a/packages/SystemUI/res/layout/global_actions_grid_item_v2.xml
+++ b/packages/SystemUI/res/layout/global_actions_grid_item_v2.xml
@@ -20,51 +20,35 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="0dp"
     android:layout_weight="1"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:paddingTop="@dimen/global_actions_grid_item_vertical_margin"
-    android:paddingBottom="@dimen/global_actions_grid_item_vertical_margin"
+    android:layout_height="98dp"
+    android:gravity="bottom|center_horizontal"
+    android:orientation="vertical"
+    android:paddingTop="12dp"
+    android:paddingBottom="12dp"
     android:paddingLeft="@dimen/global_actions_grid_item_side_margin"
     android:paddingRight="@dimen/global_actions_grid_item_side_margin"
     android:layout_marginRight="@dimen/control_base_item_margin"
     android:layout_marginLeft="@dimen/control_base_item_margin"
     android:stateListAnimator="@anim/control_state_list_animator"
     android:background="@drawable/control_background">
-    <LinearLayout
-        android:layout_width="@dimen/global_actions_grid_item_width"
-        android:layout_height="@dimen/global_actions_grid_item_height"
-        android:gravity="top|center_horizontal"
-        android:orientation="vertical">
         <ImageView
             android:id="@*android:id/icon"
-            android:layout_width="@dimen/global_actions_grid_item_icon_width"
-            android:layout_height="@dimen/global_actions_grid_item_icon_height"
-            android:layout_marginTop="@dimen/global_actions_grid_item_icon_top_margin"
-            android:layout_marginBottom="@dimen/global_actions_grid_item_icon_bottom_margin"
-            android:layout_marginLeft="@dimen/global_actions_grid_item_icon_side_margin"
-            android:layout_marginRight="@dimen/global_actions_grid_item_icon_side_margin"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginBottom="14dp"
             android:scaleType="centerInside"
-            android:tint="@color/control_default_foreground" />
-
+            android:tint="@color/control_primary_text" />
         <TextView
             android:id="@*android:id/message"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="marquee"
             android:marqueeRepeatLimit="marquee_forever"
-            android:singleLine="true"
+            android:maxLines="2"
+            android:textSize="12sp"
             android:gravity="center"
-            android:textSize="12dp"
-            android:textColor="@color/control_default_foreground"
+            android:textColor="@color/control_primary_text"
+            android:breakStrategy="high_quality"
+            android:hyphenationFrequency="full"
             android:textAppearance="?android:attr/textAppearanceSmall" />
-
-        <TextView
-            android:visibility="gone"
-            android:id="@*android:id/status"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textColor="@color/control_default_foreground"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-    </LinearLayout>
 </LinearLayout>