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

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

Merge "Ensure mKeyguardShowing set during ActionsDialog layout." into rvc-dev am: 920cd50f 

Change-Id: I9d14d344942430dffbef90d2e21acc1a4a9c1f60
parents 4c1c7426 920cd50f

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

+3 −4
Original line number Diff line number Diff line
@@ -616,10 +616,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
                getWalletPanelViewController(), mDepthController, mSysuiColorExtractor,

                mStatusBarService, mNotificationShadeWindowController,

                shouldShowControls() ? mControlsUiController : null, mBlurUtils,

                shouldUseControlsLayout(), this::onRotate);

                shouldUseControlsLayout(), this::onRotate, mKeyguardShowing);

        dialog.setCanceledOnTouchOutside(false); // Handled by the custom class.

        dialog.setKeyguardShowing(mKeyguardShowing);



        dialog.setOnDismissListener(this);

        dialog.setOnShowListener(this);
@@ -1912,7 +1910,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
                SysuiColorExtractor sysuiColorExtractor, IStatusBarService statusBarService,

                NotificationShadeWindowController notificationShadeWindowController,

                ControlsUiController controlsUiController, BlurUtils blurUtils,

                boolean useControlsLayout, Runnable onRotateCallback) {

                boolean useControlsLayout, Runnable onRotateCallback, boolean keyguardShowing) {

            super(context, com.android.systemui.R.style.Theme_SystemUI_Dialog_GlobalActions);

            mContext = context;

            mAdapter = adapter;
@@ -1925,6 +1923,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
            mBlurUtils = blurUtils;

            mUseControlsLayout = useControlsLayout;

            mOnRotateCallback = onRotateCallback;

            mKeyguardShowing = keyguardShowing;



            // Window initialization

            Window window = getWindow();