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

Merge "Controls UI - Blank activity when launched on lock screen" into rvc-dev am: 18b5f5fa35

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004850

Change-Id: I2ccf96354b1230f57740a74c05893da47d08ee40
This commit is contained in:
TreeHugger Robot
2020-06-26 17:53:36 +00:00
committed by Automerger Merge Worker
parent 72cc7b34fc 18b5f5fa35
commit 5a879396df
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt
View File

@@ -128,15 +128,22 @@ class ControlActionCoordinatorImpl @Inject constructor(
}
private fun bouncerOrRun(action: Action) {
if (!keyguardStateController.isUnlocked()) {
context.sendBroadcast(Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS))
if (keyguardStateController.isShowing()) {
var closeGlobalActions = !keyguardStateController.isUnlocked()
if (closeGlobalActions) {
context.sendBroadcast(Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS))
// pending actions will only run after the control state has been refreshed
pendingAction = action
// pending actions will only run after the control state has been refreshed
pendingAction = action
}
activityStarter.dismissKeyguardThenExecute({
Log.d(ControlsUiController.TAG, "Device unlocked, invoking controls action")
globalActionsComponent.handleShowGlobalActionsMenu()
if (closeGlobalActions) {
globalActionsComponent.handleShowGlobalActionsMenu()
} else {
action.invoke()
}
true
}, { pendingAction = null }, true /* afterKeyguardGone */)
} else {

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

@@ -2637,10 +2637,10 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
}
private boolean shouldShowControls() {
return (mKeyguardStateController.isUnlocked() || mShowLockScreenCardsAndControls)
&& controlsAvailable()
&& mLockPatternUtils.getStrongAuthForUser(getCurrentUser().id)
!= STRONG_AUTH_REQUIRED_AFTER_BOOT;
boolean showOnLockScreen = mShowLockScreenCardsAndControls && mLockPatternUtils
.getStrongAuthForUser(getCurrentUser().id) != STRONG_AUTH_REQUIRED_AFTER_BOOT;
return controlsAvailable()
&& (mKeyguardStateController.isUnlocked() || showOnLockScreen);
}
private boolean controlsAvailable() {