Merge "Fix Keyboard over Keyguard when password is set." (fae59847) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -220,6 +220,7 @@ public class StatusBarKeyguardViewManager {
	mPhoneStatusBar.getNavigationBarView().setVisibility(View.GONE);		mPhoneStatusBar.getNavigationBarView().setVisibility(View.GONE);
	}		}
	}		}
			mStatusBarWindowManager.setBouncerShowing(mBouncer.isShowing());
	mPhoneStatusBar.setBouncerShowing(mBouncer.isShowing());		mPhoneStatusBar.setBouncerShowing(mBouncer.isShowing());
	}		}

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -111,7 +111,8 @@ public class StatusBarWindowManager {
	}		}

	private void applyFocusableFlag(State state) {		private void applyFocusableFlag(State state) {
	if (state.isKeyguardShowingAndNotOccluded() && state.keyguardNeedsInput) {		if (state.isKeyguardShowingAndNotOccluded() && state.keyguardNeedsInput
			&& state.bouncerShowing) {
	mLp.flags &= ~WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;		mLp.flags &= ~WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
	mLp.flags &= ~WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;		mLp.flags &= ~WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
	} else if (state.isKeyguardShowingAndNotOccluded() \|\| state.statusBarFocusable) {		} else if (state.isKeyguardShowingAndNotOccluded() \|\| state.statusBarFocusable) {
	@@ -196,6 +197,11 @@ public class StatusBarWindowManager {
	apply(mCurrentState);		apply(mCurrentState);
	}		}

			public void setBouncerShowing(boolean showing) {
			mCurrentState.bouncerShowing = showing;
			apply(mCurrentState);
			}

	/**		/**
	* @param state The {@link StatusBarState} of the status bar.		* @param state The {@link StatusBarState} of the status bar.
	*/		*/
	@@ -211,6 +217,7 @@ public class StatusBarWindowManager {
	boolean statusBarExpanded;		boolean statusBarExpanded;
	boolean statusBarFocusable;		boolean statusBarFocusable;
	long keyguardUserActivityTimeout;		long keyguardUserActivityTimeout;
			boolean bouncerShowing;

	/**		/**
	* The {@link BaseStatusBar} state from the status bar.		* The {@link BaseStatusBar} state from the status bar.