commit 6117e4ded2d11f81b2d3241654cc7f053af1d7d6
author Aran Ink <nesciosquid@google.com> Tue Apr 21 14:25:46 2020 -0400
committer android-build-team Robot <android-build-team-robot@google.com> Tue Apr 21 22:59:29 2020 +0000
tree 0fe2a7e9ee4600c8424f3610848ce6324816560b
parent 897ed008ef895f05a7d7c94423f4835b6a29e4ec

Disable overflow menu on lock screen.

Test: Manual -- overflow menu does not appear when power menu launched from keyguard. All items appear in one row.

Fixes: 154441764
Change-Id: I5430b08749603e9d4fcbbbedeeb9644966235d1d
(cherry picked from commit cf313aaaad8a76b2b8ae55d54f1753268c1d3dc3)

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 3226605..910a7e3 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -479,7 +479,8 @@
      */
     @VisibleForTesting
     protected int getMaxShownPowerItems() {
-        if (shouldUseControlsLayout()) {
+        // TODO: Overflow disabled on keyguard while we solve for touch blocking issues.
+        if (shouldUseControlsLayout() && !mKeyguardShowing) {
             return mResources.getInteger(com.android.systemui.R.integer.power_menu_max_columns);
         } else {
             return Integer.MAX_VALUE;