From dc165631a3fbe3de3eafcbc1ea16544dd7a52988 Mon Sep 17 00:00:00 2001
From: Steve Elliott <steell@google.com>
Date: Thu, 23 May 2019 14:26:31 -0400
Subject: [PATCH] Only use grid layout for power menu when wallet is visible

Fixes: 133426008
Test: manual
Change-Id: I55d46f16feb71e4b6733706e0ebaf154e1ca074e
---
 .../android/systemui/globalactions/GlobalActionsDialog.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
index 7b8a4243a455d..ff16ed0f14772 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -1631,8 +1631,10 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
         }
 
         private int getGlobalActionsLayoutId(Context context) {
-            boolean useGridLayout = isForceGridEnabled(context) || shouldUsePanel();
-            if (RotationUtils.getRotation(context) == RotationUtils.ROTATION_SEASCAPE) {
+            int rotation = RotationUtils.getRotation(context);
+            boolean useGridLayout = isForceGridEnabled(context)
+                    || (shouldUsePanel() && rotation == RotationUtils.ROTATION_NONE);
+            if (rotation == RotationUtils.ROTATION_SEASCAPE) {
                 if (useGridLayout) {
                     return com.android.systemui.R.layout.global_actions_grid_seascape;
                 } else {