diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index ff02e71147fd..a24432fee6c8 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -86,6 +86,7 @@ import com.android.internal.util.ScreenRecordHelper; import com.android.internal.util.ScreenshotHelper; import com.android.internal.view.RotationPolicy; import com.android.internal.widget.LockPatternUtils; +import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.Dependency; import com.android.systemui.Interpolators; import com.android.systemui.MultiListLayout; @@ -213,11 +214,13 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, Dependency.get(ConfigurationController.class).addCallback(this); mActivityStarter = Dependency.get(ActivityStarter.class); + KeyguardUpdateMonitor keyguardUpdateMonitor = KeyguardUpdateMonitor.getInstance(context); UnlockMethodCache unlockMethodCache = UnlockMethodCache.getInstance(context); unlockMethodCache.addListener( () -> { if (mDialog != null && mDialog.mPanelController != null) { - boolean locked = !unlockMethodCache.canSkipBouncer(); + boolean locked = !unlockMethodCache.canSkipBouncer() + && keyguardUpdateMonitor.isKeyguardVisible(); mDialog.mPanelController.onDeviceLockStateChanged(locked); } }); |