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

Commit beae6de4 authored by Aran Ink's avatar Aran Ink Committed by Automerger Merge Worker
Browse files

Merge "Set max items to 4 on lock screen, re-disable overflow." into rvc-dev am: d41bdc07 

Change-Id: I656da38236b158e6f997d63f71250d9c10e09c36
parents df32a933 d41bdc07

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

+11 −2
Original line number Diff line number Diff line
@@ -485,7 +485,15 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
    @VisibleForTesting

    protected int getMaxShownPowerItems() {

        if (shouldUseControlsLayout()) {

            return mResources.getInteger(com.android.systemui.R.integer.power_menu_max_columns);

            int maxColumns =

                    mResources.getInteger(com.android.systemui.R.integer.power_menu_max_columns);

            // TODO: Overflow temporarily disabled on keyguard to prevent touch issues.

            // Show an extra item on the keyguard because the overflow button currently disabled.

            if (mKeyguardShowing) {

                return maxColumns + 1;

            } else {

                return maxColumns;

            }

        } else {

            return Integer.MAX_VALUE;

        }
@@ -2059,7 +2067,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
            View overflowButton = findViewById(

                    com.android.systemui.R.id.global_actions_overflow_button);

            if (overflowButton != null) {

                if (mOverflowAdapter.getCount() > 0) {

                // TODO: Overflow button hidden on keyguard to temporarily prevent touch issues.

                if (mOverflowAdapter.getCount() > 0 && !mKeyguardShowing) {

                    overflowButton.setOnClickListener((view) -> showPowerOverflowMenu());

                    LinearLayout.LayoutParams params =

                            (LinearLayout.LayoutParams) mGlobalActionsLayout.getLayoutParams();