Skip to content

Commit 38cb84f

Browse files
Winson ChungAndroid (Google) Code Review
authored andcommitted
Merge "Reverting min scale in the previous animation changes."
2 parents 908e71e + 108b060 commit 38cb84f

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3135,11 +3135,8 @@ private Animation createScaleUpAnimationLocked(int transit, boolean enter) {
31353135
}
31363136
if (enter) {
31373137
// Entering app zooms out from the center of the initial rect.
3138-
final float minScale = 0.1f;
3139-
float scaleW = minScale +
3140-
((1f - minScale) * mNextAppTransitionStartWidth / (float) mAppDisplayWidth);
3141-
float scaleH = minScale +
3142-
((1f - minScale) * mNextAppTransitionStartHeight / (float) mAppDisplayHeight);
3138+
float scaleW = mNextAppTransitionStartWidth / (float) mAppDisplayWidth;
3139+
float scaleH = mNextAppTransitionStartHeight / (float) mAppDisplayHeight;
31433140
Animation scale = new ScaleAnimation(scaleW, 1, scaleH, 1,
31443141
computePivot(mNextAppTransitionStartX, scaleW),
31453142
computePivot(mNextAppTransitionStartY, scaleH));

0 commit comments

Comments
 (0)