Merge "Save resized windows even if freezing." into jb-mr1-dev (138f272b) · Commits · e / os / android_frameworks_base

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

+35 −33

Original line number	Original line	Diff line number	Diff line
	@@ -8726,7 +8726,7 @@ public class WindowManagerService extends IWindowManager.Stub

	private void updateResizingWindows(final WindowState w) {		private void updateResizingWindows(final WindowState w) {
	final WindowStateAnimator winAnimator = w.mWinAnimator;		final WindowStateAnimator winAnimator = w.mWinAnimator;
	if (w.mHasSurface && !w.mAppFreezing && w.mLayoutSeq == mLayoutSeq) {		if (w.mHasSurface && w.mLayoutSeq == mLayoutSeq) {
	w.mContentInsetsChanged \|=		w.mContentInsetsChanged \|=
	!w.mLastContentInsets.equals(w.mContentInsets);		!w.mLastContentInsets.equals(w.mContentInsets);
	w.mVisibleInsetsChanged \|=		w.mVisibleInsetsChanged \|=
	@@ -9261,9 +9261,12 @@ public class WindowManagerService extends IWindowManager.Stub
	defaultDisplay.pendingLayoutChanges);		defaultDisplay.pendingLayoutChanges);
	}		}

	if (!mResizingWindows.isEmpty()) {
	for (i = mResizingWindows.size() - 1; i >= 0; i--) {		for (i = mResizingWindows.size() - 1; i >= 0; i--) {
	WindowState win = mResizingWindows.get(i);		WindowState win = mResizingWindows.get(i);
			if (win.mAppFreezing) {
			// Don't remove this window until rotation has completed.
			continue;
			}
	final WindowStateAnimator winAnimator = win.mWinAnimator;		final WindowStateAnimator winAnimator = win.mWinAnimator;
	try {		try {
	if (DEBUG_RESIZE \|\| DEBUG_ORIENTATION) Slog.v(TAG,		if (DEBUG_RESIZE \|\| DEBUG_ORIENTATION) Slog.v(TAG,
	@@ -9292,8 +9295,7 @@ public class WindowManagerService extends IWindowManager.Stub
	} catch (RemoteException e) {		} catch (RemoteException e) {
	win.mOrientationChanging = false;		win.mOrientationChanging = false;
	}		}
	}		mResizingWindows.remove(i);
	mResizingWindows.clear();
	}		}

	if (DEBUG_ORIENTATION && mDisplayFrozen) Slog.v(TAG,		if (DEBUG_ORIENTATION && mDisplayFrozen) Slog.v(TAG,