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

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

Browse Source 
Change-Id: Ief0e66318ca02a2d05736e103b15d00187efcd80
This commit is contained in:
TreeHugger Robot
2020-04-28 19:56:44 +00:00
committed by Automerger Merge Worker
parent d6eeac52a3 920cd50f5c
commit ad9fcfa517
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -616,10 +616,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
getWalletPanelViewController(), mDepthController, mSysuiColorExtractor, getWalletPanelViewController(), mDepthController, mSysuiColorExtractor,
mStatusBarService, mNotificationShadeWindowController, mStatusBarService, mNotificationShadeWindowController,
shouldShowControls() ? mControlsUiController : null, mBlurUtils, shouldShowControls() ? mControlsUiController : null, mBlurUtils,
shouldUseControlsLayout(), this::onRotate); shouldUseControlsLayout(), this::onRotate, mKeyguardShowing);
dialog.setCanceledOnTouchOutside(false); // Handled by the custom class. dialog.setCanceledOnTouchOutside(false); // Handled by the custom class.
dialog.setKeyguardShowing(mKeyguardShowing);
dialog.setOnDismissListener(this); dialog.setOnDismissListener(this);
dialog.setOnShowListener(this); dialog.setOnShowListener(this);
@@ -1912,7 +1910,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
SysuiColorExtractor sysuiColorExtractor, IStatusBarService statusBarService, SysuiColorExtractor sysuiColorExtractor, IStatusBarService statusBarService,
NotificationShadeWindowController notificationShadeWindowController, NotificationShadeWindowController notificationShadeWindowController,
ControlsUiController controlsUiController, BlurUtils blurUtils, 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); super(context, com.android.systemui.R.style.Theme_SystemUI_Dialog_GlobalActions);
mContext = context; mContext = context;
mAdapter = adapter; mAdapter = adapter;
@@ -1925,6 +1923,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
mBlurUtils = blurUtils; mBlurUtils = blurUtils;
mUseControlsLayout = useControlsLayout; mUseControlsLayout = useControlsLayout;
mOnRotateCallback = onRotateCallback; mOnRotateCallback = onRotateCallback;
mKeyguardShowing = keyguardShowing;
// Window initialization // Window initialization
Window window = getWindow(); Window window = getWindow();