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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-26 17:49:06 +00:00
committed by Android (Google) Code Review
parent 4c0c73d0cb 8dad3df933
commit 18b5f5fa35
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) { private fun bouncerOrRun(action: Action) {
if (!keyguardStateController.isUnlocked()) { if (keyguardStateController.isShowing()) {
context.sendBroadcast(Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)) 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 // pending actions will only run after the control state has been refreshed
pendingAction = action pendingAction = action
}
activityStarter.dismissKeyguardThenExecute({ activityStarter.dismissKeyguardThenExecute({
Log.d(ControlsUiController.TAG, "Device unlocked, invoking controls action") Log.d(ControlsUiController.TAG, "Device unlocked, invoking controls action")
globalActionsComponent.handleShowGlobalActionsMenu() if (closeGlobalActions) {
globalActionsComponent.handleShowGlobalActionsMenu()
} else {
action.invoke()
}
true true
}, { pendingAction = null }, true /* afterKeyguardGone */) }, { pendingAction = null }, true /* afterKeyguardGone */)
} else { } 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() { private boolean shouldShowControls() {
return (mKeyguardStateController.isUnlocked() || mShowLockScreenCardsAndControls) boolean showOnLockScreen = mShowLockScreenCardsAndControls && mLockPatternUtils
&& controlsAvailable() .getStrongAuthForUser(getCurrentUser().id) != STRONG_AUTH_REQUIRED_AFTER_BOOT;
&& mLockPatternUtils.getStrongAuthForUser(getCurrentUser().id) return controlsAvailable()
!= STRONG_AUTH_REQUIRED_AFTER_BOOT; && (mKeyguardStateController.isUnlocked() || showOnLockScreen);
} }
private boolean controlsAvailable() { private boolean controlsAvailable() {