From 99c452d6cdb17d276b2d3cdeec1456cf547964a1 Mon Sep 17 00:00:00 2001
From: Aran Ink <nesciosquid@google.com>
Date: Tue, 28 Apr 2020 14:23:13 -0400
Subject: [PATCH] Ensure mKeyguardShowing set during ActionsDialog layout.

Bug: 154669090
Test: Manual -- with more than 4 actions, only 4 are visible on lock screen, with no overflow menu.
Change-Id: I002dd99daebec983076c886ab64d2184ee499ce4
---
 .../systemui/globalactions/GlobalActionsDialog.java        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
index 76bd6aa5ec012..80ebe5701c3c2 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -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();