Fix that bouncer is not focusable if shown without notification shade

Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test android.server.cts.KeyguardLockedTests#testDismissKeyguard_fromShowWhenLocked
Change-Id: Ia300cea18b0ed7c9bfe04f3aa051d8a04a6eaedc
This commit is contained in:
Jorim Jaggi
2016-11-02 18:11:03 -07:00
parent 46fff5e905
commit 8a825e9076

View File

@@ -137,8 +137,7 @@ public class StatusBarWindowManager implements RemoteInputController.Callback {
private void applyFocusableFlag(State state) {
boolean panelFocusable = state.statusBarFocusable && state.panelExpanded;
if (state.keyguardShowing && state.keyguardNeedsInput && state.bouncerShowing
|| BaseStatusBar.ENABLE_REMOTE_INPUT && state.remoteInputActive) {
if (state.bouncerShowing || BaseStatusBar.ENABLE_REMOTE_INPUT && state.remoteInputActive) {
mLpChanged.flags &= ~WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
mLpChanged.flags &= ~WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
} else if (state.isKeyguardShowingAndNotOccluded() || panelFocusable) {