Merge "resolved conflicts for merge of 4d28e8c5 to master" (4b85ce66) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -1550,7 +1550,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		if (attrs.type >= FIRST_APPLICATION_WINDOW
		&& attrs.type <= LAST_APPLICATION_WINDOW
		&& win.fillsScreenLw(mW, mH, false, false)) {
		&& attrs.x == 0 && attrs.y == 0
		&& attrs.width == WindowManager.LayoutParams.MATCH_PARENT
		&& attrs.height == WindowManager.LayoutParams.MATCH_PARENT) {
		if (DEBUG_LAYOUT) Log.v(TAG, "Fullscreen window: " + win);
		mTopFullscreenOpaqueWindowState = win;
		if ((attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0) {

+0 −28

Original line number	Diff line number	Diff line
		@@ -7475,34 +7475,6 @@ public class WindowManagerService extends IWindowManager.Stub
		&& !mDrawPending && !mCommitDrawPending;
		}

		public boolean fillsScreenLw(int screenWidth, int screenHeight,
		boolean shownFrame, boolean onlyOpaque) {
		if (mSurface == null) {
		return false;
		}
		if (mAppToken != null && !mAppToken.appFullscreen) {
		return false;
		}
		if (onlyOpaque && mAttrs.format != PixelFormat.OPAQUE) {
		return false;
		}
		final Rect frame = shownFrame ? mShownFrame : mFrame;

		if ((mAttrs.flags & FLAG_COMPATIBLE_WINDOW) != 0) {
		return frame.left <= mCompatibleScreenFrame.left &&
		frame.top <= mCompatibleScreenFrame.top &&
		frame.right >= mCompatibleScreenFrame.right &&
		frame.bottom >= mCompatibleScreenFrame.bottom;
		} else {
		if ((mAttrs.flags & FLAG_FULLSCREEN) != 0) {
		return true;
		}
		return frame.left <= 0 && frame.top <= 0
		&& frame.right >= screenWidth
		&& frame.bottom >= screenHeight;
		}
		}

		/**
		* Return true if the window is opaque and fully drawn. This indicates
		* it may obscure windows behind it.