From 250a34cee3d0cbc7a34fed7bf70318cc610e0661 Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Fri, 26 Jun 2020 11:12:25 -0400
Subject: [PATCH] Global Actions - Power menu too tall in landscape

Set a different height for landscape to fit in all devices

Fixes: 159906363
Test: manual, set largest display/font
Change-Id: Ie4ab49fca4691ff377af0f5df329c6b97343d604
---
 packages/SystemUI/res/layout/global_actions_power_item.xml | 2 +-
 packages/SystemUI/res/values-land/dimens.xml               | 3 +++
 packages/SystemUI/res/values/dimens.xml                    | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/res/layout/global_actions_power_item.xml b/packages/SystemUI/res/layout/global_actions_power_item.xml
index 0d060b63486ff..3bf58944423b3 100644
--- a/packages/SystemUI/res/layout/global_actions_power_item.xml
+++ b/packages/SystemUI/res/layout/global_actions_power_item.xml
@@ -26,7 +26,7 @@
         android:id="@*android:id/icon"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginBottom="45dp"
+        android:layout_marginBottom="@dimen/global_actions_power_dialog_item_bottom_margin"
         android:scaleType="centerInside"
         android:tint="@color/control_primary_text" />
     <TextView
diff --git a/packages/SystemUI/res/values-land/dimens.xml b/packages/SystemUI/res/values-land/dimens.xml
index 2c08925be4966..9e1b66f077584 100644
--- a/packages/SystemUI/res/values-land/dimens.xml
+++ b/packages/SystemUI/res/values-land/dimens.xml
@@ -44,4 +44,7 @@
 
     <dimen name="biometric_dialog_button_negative_max_width">140dp</dimen>
     <dimen name="biometric_dialog_button_positive_max_width">116dp</dimen>
+
+    <dimen name="global_actions_power_dialog_item_height">130dp</dimen>
+    <dimen name="global_actions_power_dialog_item_bottom_margin">35dp</dimen>
 </resources>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 29a2ad4cba9fb..f1a0e3e2dc954 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -1061,6 +1061,7 @@
     <!-- Shutdown and restart actions are larger in power options dialog -->
     <dimen name="global_actions_power_dialog_item_height">190dp</dimen>
     <dimen name="global_actions_power_dialog_item_width">255dp</dimen>
+    <dimen name="global_actions_power_dialog_item_bottom_margin">45dp</dimen>
 
     <!-- The maximum offset in either direction that elements are moved horizontally to prevent
          burn-in on AOD. -->