commit dc165631a3fbe3de3eafcbc1ea16544dd7a52988
author Steve Elliott <steell@google.com> Thu May 23 14:26:31 2019 -0400
committer Steve Elliott <steell@google.com> Thu May 23 14:26:31 2019 -0400
tree 92c04d3ca9d008111b6ac3e49723455152303ef5
parent 3d8f95a4382b980da3fc8d7c6bbe68ae53ec1cc0

Only use grid layout for power menu when wallet is visible

Fixes: 133426008
Test: manual
Change-Id: I55d46f16feb71e4b6733706e0ebaf154e1ca074e

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
index 7b8a424..ff16ed0 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 @@
         }
 
         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 {