Merge "Keep layout from overwriting translate dimensions" into jb-dev (393295fa) · Commits · e / os / android_frameworks_base

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

+1 −17

Original line number	Original line	Diff line number	Diff line
	@@ -6671,8 +6671,7 @@ public class WindowManagerService extends IWindowManager.Stub
	public static final int SET_TRANSPARENT_REGION = ANIMATOR_WHAT_OFFSET + 1;		public static final int SET_TRANSPARENT_REGION = ANIMATOR_WHAT_OFFSET + 1;
	public static final int SET_WALLPAPER_OFFSET = ANIMATOR_WHAT_OFFSET + 2;		public static final int SET_WALLPAPER_OFFSET = ANIMATOR_WHAT_OFFSET + 2;
	public static final int SET_DIM_PARAMETERS = ANIMATOR_WHAT_OFFSET + 3;		public static final int SET_DIM_PARAMETERS = ANIMATOR_WHAT_OFFSET + 3;
	public static final int SET_MOVE_ANIMATION = ANIMATOR_WHAT_OFFSET + 4;		public static final int CLEAR_PENDING_ACTIONS = ANIMATOR_WHAT_OFFSET + 4;
	public static final int CLEAR_PENDING_ACTIONS = ANIMATOR_WHAT_OFFSET + 5;

	private Session mLastReportedHold;		private Session mLastReportedHold;

	@@ -7156,18 +7155,6 @@ public class WindowManagerService extends IWindowManager.Stub
	break;		break;
	}		}

	case SET_MOVE_ANIMATION: {
	WindowAnimator.SetAnimationParams params =
	(WindowAnimator.SetAnimationParams) msg.obj;
	WindowStateAnimator winAnimator = params.mWinAnimator;
	winAnimator.setAnimation(params.mAnimation);
	winAnimator.mAnimDw = params.mAnimDw;
	winAnimator.mAnimDh = params.mAnimDh;

	scheduleAnimationLocked();
	break;
	}

	case CLEAR_PENDING_ACTIONS: {		case CLEAR_PENDING_ACTIONS: {
	mAnimator.clearPendingActions();		mAnimator.clearPendingActions();
	break;		break;
	@@ -8415,9 +8402,6 @@ public class WindowManagerService extends IWindowManager.Stub
	winAnimator.setAnimation(a);		winAnimator.setAnimation(a);
	winAnimator.mAnimDw = w.mLastFrame.left - w.mFrame.left;		winAnimator.mAnimDw = w.mLastFrame.left - w.mFrame.left;
	winAnimator.mAnimDh = w.mLastFrame.top - w.mFrame.top;		winAnimator.mAnimDh = w.mLastFrame.top - w.mFrame.top;
	} else {
	winAnimator.mAnimDw = innerDw;
	winAnimator.mAnimDh = innerDh;
	}		}

	//Slog.i(TAG, "Window " + this + " clearing mContentChanged - done placing");		//Slog.i(TAG, "Window " + this + " clearing mContentChanged - done placing");