am 56a1fe56: am fbe09246: am f584f111: Merge "Fix issue #7353900: Brief flash... (b1e51d8f) · Commits · e / os / android_frameworks_base

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

+28 −10

Original line number	Diff line number	Diff line
		@@ -413,7 +413,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		boolean mForceStatusBarFromKeyguard;
		boolean mHideLockScreen;
		boolean mDismissKeyguard;
		boolean mNoDreamEnterAnim;
		boolean mShowingLockscreen;
		boolean mShowingDream;
		boolean mDreamingLockscreen;
		boolean mHomePressed;
		boolean mHomeLongPressed;
		Intent mHomeIntent;
		@@ -1726,7 +1728,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		if (PRINT_ANIM) Log.i(TAG, "**** STARTING EXIT");
		return com.android.internal.R.anim.app_starting_exit;
		}
		} else if (win.getAttrs().type == TYPE_DREAM && mNoDreamEnterAnim
		} else if (win.getAttrs().type == TYPE_DREAM && mDreamingLockscreen
		&& transit == TRANSIT_ENTER) {
		// Special case: we are animating in a dream, while the keyguard
		// is shown. We don't want an animation on the dream, because
		@@ -2927,7 +2929,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		mHideLockScreen = false;
		mAllowLockscreenWhenOn = false;
		mDismissKeyguard = false;
		mNoDreamEnterAnim = false;
		mShowingLockscreen = false;
		mShowingDream = false;
		}

		/** {@inheritDoc} */
		@@ -2945,18 +2948,24 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		}
		if (attrs.type == TYPE_KEYGUARD) {
		mNoDreamEnterAnim = true;
		mShowingLockscreen = true;
		}
		if (((attrs.type >= FIRST_APPLICATION_WINDOW && attrs.type <= LAST_APPLICATION_WINDOW)
		\|\| (attrs.type == TYPE_DREAM && win.isVisibleLw()))
		boolean applyWindow = attrs.type >= FIRST_APPLICATION_WINDOW
		&& attrs.type <= LAST_APPLICATION_WINDOW;
		if (attrs.type == TYPE_DREAM) {
		mShowingDream = true;
		if (!mDreamingLockscreen) {
		applyWindow = true;
		} else if (win.isVisibleLw() && win.hasDrawnLw()) {
		applyWindow = true;
		}
		}
		if (applyWindow
		&& 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.type == TYPE_DREAM) {
		mForceStatusBarFromKeyguard = true;
		}
		if ((attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0) {
		if (DEBUG_LAYOUT) Log.v(TAG, "Setting mHideLockScreen to true by win " + win);
		mHideLockScreen = true;
		@@ -2983,6 +2992,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		? mTopFullscreenOpaqueWindowState.getAttrs()
		: null;

		// If we are not currently showing a dream, then update the lockscreen
		// state that will apply if a dream is shown next time.
		if (!mShowingDream) {
		mDreamingLockscreen = mShowingLockscreen;
		}

		if (mStatusBar != null) {
		if (DEBUG_LAYOUT) Log.i(TAG, "force=" + mForceStatusBar
		+ " forcefkg=" + mForceStatusBarFromKeyguard
		@@ -4523,6 +4538,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		pw.print(","); pw.print(mDockBottom); pw.println(")");
		pw.print(prefix); pw.print("mDockLayer="); pw.print(mDockLayer);
		pw.print(" mStatusBarLayer="); pw.println(mStatusBarLayer);
		pw.print(prefix); pw.print("mShowingLockscreen="); pw.print(mShowingLockscreen);
		pw.print(" mShowingDream="); pw.print(mShowingDream);
		pw.print(" mDreamingLockscreen="); pw.println(mDreamingLockscreen);
		pw.print(prefix); pw.print("mTopFullscreenOpaqueWindowState=");
		pw.println(mTopFullscreenOpaqueWindowState);
		pw.print(prefix); pw.print("mTopIsFullscreen="); pw.print(mTopIsFullscreen);

services/java/com/android/server/wm/WindowManagerService.java

+24 −1

Original line number	Diff line number	Diff line
		@@ -2244,6 +2244,14 @@ public class WindowManagerService extends IWindowManager.Stub
		adjustWallpaperWindowsLocked();
		} else if ((attrs.flags&FLAG_SHOW_WALLPAPER) != 0) {
		adjustWallpaperWindowsLocked();
		} else if (mWallpaperTarget != null
		&& mWallpaperTarget.mLayer >= win.mBaseLayer) {
		// If there is currently a wallpaper being shown, and
		// the base layer of the new window is below the current
		// layer of the target window, then adjust the wallpaper.
		// This is to avoid a new window being placed between the
		// wallpaper and its target.
		adjustWallpaperWindowsLocked();
		}
		}

		@@ -8201,11 +8209,13 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		private final void performLayoutAndPlaceSurfacesLocked() {
		int loopCount = 6;
		do {
		mTraversalScheduled = false;
		performLayoutAndPlaceSurfacesLockedLoop();
		mH.removeMessages(H.DO_TRAVERSAL);
		} while (mTraversalScheduled);
		loopCount--;
		} while (mTraversalScheduled && loopCount > 0);
		}

		private boolean mInLayout = false;
		@@ -9165,6 +9175,19 @@ public class WindowManagerService extends IWindowManager.Stub
		final boolean committed =
		winAnimator.commitFinishDrawingLocked(currentTime);
		if (isDefaultDisplay && committed) {
		if (w.mAttrs.type == TYPE_DREAM) {
		// HACK: When a dream is shown, it may at that
		// point hide the lock screen. So we need to
		// redo the layout to let the phone window manager
		// make this happen.
		displayContent.pendingLayoutChanges \|=
		WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT;
		if (WindowManagerService.DEBUG_LAYOUT_REPEATS) {
		debugLayoutRepeats(
		"dream and commitFinishDrawingLocked true",
		displayContent.pendingLayoutChanges);
		}
		}
		if ((w.mAttrs.flags & FLAG_SHOW_WALLPAPER) != 0) {
		if (DEBUG_WALLPAPER) Slog.v(TAG,
		"First draw done in potential wallpaper target " + w);