Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I4ea3550b870cde80d76ef3e56c16b4bb650b4662
This commit is contained in:
TreeHugger Robot
2020-04-21 20:11:06 +00:00
committed by Automerger Merge Worker
parent a90d0214d4 126b567a6e
commit dd472745e7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
View File

@@ -482,7 +482,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
*/ */
@VisibleForTesting @VisibleForTesting
protected int getMaxShownPowerItems() { 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); return mResources.getInteger(com.android.systemui.R.integer.power_menu_max_columns);
} else { } else {
return Integer.MAX_VALUE; return Integer.MAX_VALUE;