commit e2d92acee548ede31aae1aa2061299d285957763
author Aaron Heuckroth <nesciosquid@google.com> Wed May 01 10:44:59 2019 -0400
committer Aaron Heuckroth <nesciosquid@google.com> Wed May 01 17:21:57 2019 +0000
tree c999f6ab355a4826e5ac57049b1c5b11ab0f37cc
parent 5e28f8c8385ba1c3c196e1b5ea8a610ce5bde0c3

Add GlobalActionsColumnLayout to replace HardwareUILayout.

Refactor code to improve code re-use and enable testing, and add lots of unit tests.
HardwareUILayout is no longer used.

Test: Automated tests pass. Manual testing with different display sizes and with panel plugin enabled/disabled.

Fixes: 130808177
Fixes: 128372852

Change-Id: I1e48d226973a9b610cece2691af7b233cdb5235c

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 9b69dc5..2b006ce 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -1582,13 +1582,20 @@
         }
 
         private int getGlobalActionsLayoutId(Context context) {
-            if (isForceGridEnabled(context) || shouldUsePanel()) {
-                if (RotationUtils.getRotation(context) == RotationUtils.ROTATION_SEASCAPE) {
+            boolean useGridLayout = isForceGridEnabled(context) || shouldUsePanel();
+            if (RotationUtils.getRotation(context) == RotationUtils.ROTATION_SEASCAPE) {
+                if (useGridLayout) {
                     return com.android.systemui.R.layout.global_actions_grid_seascape;
+                } else {
+                    return com.android.systemui.R.layout.global_actions_column_seascape;
                 }
-                return com.android.systemui.R.layout.global_actions_grid;
+            } else {
+                if (useGridLayout) {
+                    return com.android.systemui.R.layout.global_actions_grid;
+                } else {
+                    return com.android.systemui.R.layout.global_actions_column;
+                }
             }
-            return com.android.systemui.R.layout.global_actions_wrapped;
         }
 
         @Override
@@ -1711,7 +1718,7 @@
         }
 
         public void onRotate(int from, int to) {
-            if (mShowing && (shouldUsePanel() || isForceGridEnabled(mContext))) {
+            if (mShowing) {
                 refreshDialog();
             }
         }