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

Merge "Ensure we pass correct values into the next transition start bounds." into nyc-mr1-dev

Browse Source
This commit is contained in:
Winson Chung
2016-07-13 22:56:50 +00:00
committed by Android (Google) Code Review
parent c8daad4290 4c3fecd31f
commit 7a07477cff
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/AppTransition.java
View File

@@ -604,7 +604,7 @@ public class AppTransition implements Dump {
float scaleH = mTmpRect.height() / (float) appHeight; float scaleH = mTmpRect.height() / (float) appHeight;
Animation scale = new ScaleAnimation(scaleW, 1, scaleH, 1, Animation scale = new ScaleAnimation(scaleW, 1, scaleH, 1,
computePivot(mTmpRect.left, scaleW), computePivot(mTmpRect.left, scaleW),
computePivot(mTmpRect.right, scaleH)); computePivot(mTmpRect.top, scaleH));
scale.setInterpolator(mDecelerateInterpolator); scale.setInterpolator(mDecelerateInterpolator);
Animation alpha = new AlphaAnimation(0, 1); Animation alpha = new AlphaAnimation(0, 1);
@@ -1615,8 +1615,7 @@ public class AppTransition implements Dump {
if (isTransitionSet()) { if (isTransitionSet()) {
clear(); clear();
mNextAppTransitionType = NEXT_TRANSIT_TYPE_SCALE_UP; mNextAppTransitionType = NEXT_TRANSIT_TYPE_SCALE_UP;
putDefaultNextAppTransitionCoordinates(startX, startY, startX + startWidth, putDefaultNextAppTransitionCoordinates(startX, startY, startWidth, startHeight, null);
startY + startHeight, null);
postAnimationCallback(); postAnimationCallback();
} }
} }