Merge "Disable overflow menu on lock screen." into rvc-dev am: 126b567a6e am: dd472745e7

Change-Id: I905ec5ca86d15eaec52845826527738a3efb67b1
2020-04-21 20:24:15 +00:00
parent 6733959cea dd472745e7
commit 1cf8d67bb8
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -482,7 +482,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
     */
    @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;