am 9c614bfe: Merge "Send masked soft input mode into method." into jb-mr1-dev (65e7f05c) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -2573,11 +2573,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		final boolean hasNavBar = (isDefaultDisplay && mHasNavigationBar
		&& mNavigationBar != null && mNavigationBar.isVisibleLw());

		final int adjust = sim & SOFT_INPUT_MASK_ADJUST;

		if (!isDefaultDisplay) {
		if (attached != null) {
		// If this window is attached to another, our display
		// frame is the same as the one we are attached to.
		setAttachedWindowFrames(win, fl, sim, attached, true, pf, df, cf, vf);
		setAttachedWindowFrames(win, fl, adjust, attached, true, pf, df, cf, vf);
		} else {
		// Give the window full screen.
		pf.left = df.left = cf.left = mUnrestrictedScreenLeft;
		@@ -2596,8 +2598,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		attrs.gravity = Gravity.BOTTOM;
		mDockLayer = win.getSurfaceLayer();
		} else {
		final int adjust = sim & SOFT_INPUT_MASK_ADJUST;

		if ((fl & (FLAG_LAYOUT_IN_SCREEN \| FLAG_FULLSCREEN \| FLAG_LAYOUT_INSET_DECOR))
		== (FLAG_LAYOUT_IN_SCREEN \| FLAG_LAYOUT_INSET_DECOR)
		&& (sysUiFl & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) {
		@@ -2611,7 +2611,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		if (attached != null) {
		// If this window is attached to another, our display
		// frame is the same as the one we are attached to.
		setAttachedWindowFrames(win, fl, sim, attached, true, pf, df, cf, vf);
		setAttachedWindowFrames(win, fl, adjust, attached, true, pf, df, cf, vf);
		} else {
		if (attrs.type == TYPE_STATUS_BAR_PANEL
		\|\| attrs.type == TYPE_STATUS_BAR_SUB_PANEL) {