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

Commit 3153b31a authored by Steve Elliott's avatar Steve Elliott Committed by android-build-merger
Browse files

Merge "Only use grid layout for power menu when wallet is visible" into qt-dev am: 31b3161a 

am: 07733b7c

Change-Id: I67cc1b65dff0592a7ed7fa6cc124cc5327f827f6
parents cdb8b78b 07733b7c

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

+4 −2
Original line number Diff line number Diff line
@@ -1631,8 +1631,10 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
        }



        private int getGlobalActionsLayoutId(Context context) {

            boolean useGridLayout = isForceGridEnabled(context) || shouldUsePanel();

            if (RotationUtils.getRotation(context) == RotationUtils.ROTATION_SEASCAPE) {

            int rotation = RotationUtils.getRotation(context);

            boolean useGridLayout = isForceGridEnabled(context)

                    || (shouldUsePanel() && rotation == RotationUtils.ROTATION_NONE);

            if (rotation == RotationUtils.ROTATION_SEASCAPE) {

                if (useGridLayout) {

                    return com.android.systemui.R.layout.global_actions_grid_seascape;

                } else {