Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keep layout from overwriting translate dimensions" into jb-dev

Browse Source
This commit is contained in:
Craig Mautner
2012-05-09 11:17:19 -07:00
committed by Android (Google) Code Review
parent 14124c696d a83580614f
commit 393295fabf
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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");