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

2D Recents: Fix issues with thumbnail scaling transitions

Browse Source 
am: 57b6149f8b

Change-Id: Iacd79a63699736c9b8fb7794d45bc8891c57b513
This commit is contained in:
Manu Cornet
2017-02-02 19:26:43 +00:00
committed by android-build-merger
parent 40c83c5b0f 57b6149f8b
commit 6f5bb1f340
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
View File

@@ -733,11 +733,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener
Task toTask = new Task(); Task toTask = new Task();
TaskViewTransform toTransform = getThumbnailTransitionTransform(stackView, toTask, TaskViewTransform toTransform = getThumbnailTransitionTransform(stackView, toTask,
windowOverrideRect); windowOverrideRect);
// When using a grid layout, the header is already visible on screen at the target Bitmap thumbnail = drawThumbnailTransitionBitmap(toTask, toTransform,
// location, making it unnecessary to draw it in the transition thumbnail.
Bitmap thumbnail = stackView.useGridLayout()
? mThumbTransitionBitmapCache.createAshmemBitmap()
: drawThumbnailTransitionBitmap(toTask, toTransform,
mThumbTransitionBitmapCache); mThumbTransitionBitmapCache);
if (thumbnail != null) { if (thumbnail != null) {
RectF toTaskRect = toTransform.rect; RectF toTaskRect = toTransform.rect;

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

@@ -925,9 +925,9 @@ public class AppTransition implements Dump {
float scaleW = appWidth / thumbWidth; float scaleW = appWidth / thumbWidth;
getNextAppTransitionStartRect(taskId, mTmpRect); getNextAppTransitionStartRect(taskId, mTmpRect);
final float fromX; final float fromX;
final float fromY; float fromY;
final float toX; final float toX;
final float toY; float toY;
final float pivotX; final float pivotX;
final float pivotY; final float pivotY;
if (shouldScaleDownThumbnailTransition(uiMode, orientation)) { if (shouldScaleDownThumbnailTransition(uiMode, orientation)) {
@@ -940,6 +940,12 @@ public class AppTransition implements Dump {
toY = appRect.height() / 2 * (1 - 1 / scaleW) + appRect.top; toY = appRect.height() / 2 * (1 - 1 / scaleW) + appRect.top;
pivotX = mTmpRect.width() / 2; pivotX = mTmpRect.width() / 2;
pivotY = appRect.height() / 2 / scaleW; pivotY = appRect.height() / 2 / scaleW;
if (mGridLayoutRecentsEnabled) {
// In the grid layout, the header is displayed above the thumbnail instead of
// overlapping it.
fromY -= thumbHeightI;
toY -= thumbHeightI * scaleW;
}
} else { } else {
pivotX = 0; pivotX = 0;
pivotY = 0; pivotY = 0;
@@ -988,7 +994,10 @@ public class AppTransition implements Dump {
// This AnimationSet uses the Interpolators assigned above. // This AnimationSet uses the Interpolators assigned above.
AnimationSet set = new AnimationSet(false); AnimationSet set = new AnimationSet(false);
set.addAnimation(scale); set.addAnimation(scale);
set.addAnimation(alpha); if (!mGridLayoutRecentsEnabled) {
// In the grid layout, the header should be shown for the whole animation.
set.addAnimation(alpha);
}
set.addAnimation(translate); set.addAnimation(translate);
set.addAnimation(clipAnim); set.addAnimation(clipAnim);
a = set; a = set;
@@ -1007,7 +1016,10 @@ public class AppTransition implements Dump {
// This AnimationSet uses the Interpolators assigned above. // This AnimationSet uses the Interpolators assigned above.
AnimationSet set = new AnimationSet(false); AnimationSet set = new AnimationSet(false);
set.addAnimation(scale); set.addAnimation(scale);
set.addAnimation(alpha); if (!mGridLayoutRecentsEnabled) {
// In the grid layout, the header should be shown for the whole animation.
set.addAnimation(alpha);
}
set.addAnimation(translate); set.addAnimation(translate);
a = set; a = set;