Merge branch 'cupcake' (7ac5a085) · Commits · e / os / android_frameworks_base

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

+9 −5

Original line number	Diff line number	Diff line
		@@ -950,9 +950,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		pf.bottom = df.bottom = vf.bottom = displayHeight;

		mStatusBar.computeFrameLw(pf, df, vf, vf);
		if (mStatusBar.isDisplayedLw()) {
		// If the status bar is hidden, we don't want to cause
		// windows behind it to scroll.
		mDockTop = mContentTop = mCurTop = mStatusBar.getFrameLw().bottom;
		}
		}
		}

		void setAttachedWindowFrames(WindowState win, int fl, int sim,
		WindowState attached, boolean insetDecors, Rect pf, Rect df, Rect cf, Rect vf) {
		@@ -1154,7 +1158,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		&& attrs.type >= FIRST_APPLICATION_WINDOW
		&& attrs.type <= LAST_APPLICATION_WINDOW
		&& win.fillsScreenLw(mW, mH, true)
		&& win.isDisplayedLw()) {
		&& win.isVisibleLw()) {
		mTopFullscreenOpaqueWindowState = win;
		} else if ((attrs.flags & FLAG_FORCE_NOT_FULLSCREEN) != 0) {
		mForceStatusBar = true;
		@@ -1165,16 +1169,16 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		public boolean finishAnimationLw() {
		if (mStatusBar != null) {
		if (mForceStatusBar) {
		mStatusBar.showLw();
		mStatusBar.showLw(true);
		} else if (mTopFullscreenOpaqueWindowState != null) {
		WindowManager.LayoutParams lp =
		mTopFullscreenOpaqueWindowState.getAttrs();
		boolean hideStatusBar =
		(lp.flags & WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0;
		if (hideStatusBar) {
		mStatusBar.hideLw();
		mStatusBar.hideLw(true);
		} else {
		mStatusBar.showLw();
		mStatusBar.showLw(true);
		}
		}
		}