Merge "Fix minor problems when resizing/maximizing docked window." (dcdb3342) · Commits · e / os / android_frameworks_base

core/java/android/view/WindowManagerGlobal.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ public final class WindowManagerGlobal {

		/**
		* The window is being resized by dragging one of the window corners,
		* in this case the surface would be fullsreen-sized. The client should
		* in this case the surface would be fullscreen-sized. The client should
		* render to the actual frame location (instead of (0,curScrollY)).
		*/
		public static final int RELAYOUT_RES_DRAG_RESIZING = 0x8;

services/core/java/com/android/server/wm/WallpaperController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -149,11 +149,11 @@ class WallpaperController {
		}

		void updateWallpaperVisibility() {
		final boolean visible = isWallpaperVisible(mWallpaperTarget);
		final DisplayContent displayContent = mWallpaperTarget.getDisplayContent();
		if (displayContent == null) {
		return;
		}
		final boolean visible = isWallpaperVisible(mWallpaperTarget);
		final DisplayInfo displayInfo = displayContent.getDisplayInfo();
		final int dw = displayInfo.logicalWidth;
		final int dh = displayInfo.logicalHeight;
		@@ -205,7 +205,7 @@ class WallpaperController {
		final WindowState wallpaper = token.windows.get(j);
		final WindowStateAnimator winAnimator = wallpaper.mWinAnimator;
		if (!winAnimator.mLastHidden \|\| wasDeferred) {
		winAnimator.hide();
		winAnimator.hide("hideWallpapers");
		dispatchWallpaperVisibility(wallpaper, false);
		final DisplayContent displayContent = wallpaper.getDisplayContent();
		if (displayContent != null) {

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -2079,7 +2079,9 @@ public class WindowManagerService extends IWindowManager.Stub
		// happen, let's just simply add a window.
		return;
		}
		Rect frame = replacedWindow.mFrame;
		// We use the visible frame, because we want the animation to morph the window from what
		// was visible to the user to the final destination of the new window.
		Rect frame = replacedWindow.mVisibleFrame;
		// We treat this as if this activity was opening, so we can trigger the app transition
		// animation and piggy-back on existing transition animation infrastructure.
		mOpeningApps.add(atoken);
		@@ -8527,8 +8529,7 @@ public class WindowManagerService extends IWindowManager.Stub
		final WindowStateAnimator winAnimator = w.mWinAnimator;
		boolean layerChanged = false;
		int oldLayer = w.mLayer;
		if (w.mBaseLayer == curBaseLayer \|\| w.mIsImWindow
		\|\| (i > 0 && w.mIsWallpaper)) {
		if (w.mBaseLayer == curBaseLayer \|\| w.mIsImWindow \|\| (i > 0 && w.mIsWallpaper)) {
		curLayer += WINDOW_LAYER_MULTIPLIER;
		w.mLayer = curLayer;
		} else {

services/core/java/com/android/server/wm/WindowState.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -1429,9 +1429,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		mWinAnimator + ": " + mPolicyVisibilityAfterAnim);
		}
		mPolicyVisibility = mPolicyVisibilityAfterAnim;
		if (mDisplayContent != null) {
		mDisplayContent.layoutNeeded = true;
		}
		setDisplayLayoutNeeded();
		if (!mPolicyVisibility) {
		if (mService.mCurrentFocus == this) {
		if (DEBUG_FOCUS_LIGHT) Slog.i(TAG,

services/core/java/com/android/server/wm/WindowStateAnimator.java

+9 −12

Original line number	Diff line number	Diff line
		@@ -460,9 +460,7 @@ class WindowStateAnimator {
		if (mSurfaceController != null && mSurfaceController.hasSurface()) {
		mService.mDestroySurface.add(mWin);
		mWin.mDestroying = true;
		if (SHOW_TRANSACTIONS) WindowManagerService.logSurface(
		mWin, "HIDE (finishExit)", null);
		hide();
		hide("finishExit");
		}
		mWin.mExiting = false;
		if (mWin.mRemoveOnExit) {
		@@ -472,11 +470,11 @@ class WindowStateAnimator {
		mWallpaperControllerLocked.hideWallpapers(mWin);
		}

		void hide() {
		void hide(String reason) {
		if (!mLastHidden) {
		//dump();
		mLastHidden = true;
		mSurfaceController.hideInTransaction();
		mSurfaceController.hideInTransaction(reason);
		}
		}

		@@ -537,8 +535,8 @@ class WindowStateAnimator {
		if (mDestroyPreservedSurfaceUponRedraw) {
		return;
		}
		mSurfaceController.setLayer(WINDOW_FREEZE_LAYER);

		if (SHOW_TRANSACTIONS) WindowManagerService.logSurface(mWin, "SET FREEZE LAYER", null);
		mSurfaceController.setLayer(mAnimLayer + 1);
		mDestroyPreservedSurfaceUponRedraw = true;
		mSurfaceDestroyDeferred = true;
		destroySurfaceLocked();
		@@ -1226,9 +1224,9 @@ class WindowStateAnimator {

		if (mIsWallpaper && !mWin.mWallpaperVisible) {
		// Wallpaper is no longer visible and there is no wp target => hide it.
		hide();
		hide("prepareSurfaceLocked");
		} else if (w.mAttachedHidden \|\| !w.isOnScreen()) {
		hide();
		hide("prepareSurfaceLocked");
		mWallpaperControllerLocked.hideWallpapers(w);

		// If we are waiting for this window to handle an
		@@ -1260,7 +1258,6 @@ class WindowStateAnimator {
		mLastDtDy = mDtDy;
		w.mLastHScale = w.mHScale;
		w.mLastVScale = w.mVScale;

		if (WindowManagerService.SHOW_TRANSACTIONS) WindowManagerService.logSurface(w,
		"controller=" + mSurfaceController +
		"alpha=" + mShownAlpha + " layer=" + mAnimLayer