Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cf8d67b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: I905ec5ca86d15eaec52845826527738a3efb67b1
parents 6733959c dd472745

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+2 −1
Original line number Diff line number Diff line
@@ -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;