summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Aran Ink <nesciosquid@google.com> 2020-04-21 14:25:46 -0400
committer Aran Ink <nesciosquid@google.com> 2020-04-21 14:25:46 -0400
commitcf313aaaad8a76b2b8ae55d54f1753268c1d3dc3 (patch)
tree3214b7b9dc26a89389ed99bc500e82fa0090fc21
parent6560ab752dd54e5e8e6d5c756e52cd6984a522fa (diff)
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
-rw-r--r--packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
index 322660521ee0..910a7e33bcc4 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 @@ 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;