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

Merge "Use zero relative position for activity animation" into rvc-dev am: 3872a583fc am: 0fe667358f am: 6fa962bb4d

Browse Source 
Change-Id: Ic391f7215bbd0c4d9a9cadb18aeab935a8ea21f6
This commit is contained in:
TreeHugger Robot
2020-05-18 15:13:38 +00:00
committed by Automerger Merge Worker
parent 62fc56d117 6fa962bb4d
commit 0e0e3e8f99
3 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -6683,6 +6683,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
return task != null ? task.getBounds() : getBounds();
}
@Override
void getAnimationPosition(Point outPosition) {
// Always animate from zero because if the activity doesn't fill the task, the letterbox
// will fill the remaining area that should be included in the animation.
outPosition.set(0, 0);
}
@Override
public void onConfigurationChanged(Configuration newParentConfig) {
if (mCompatDisplayInsets != null) {

11
services/core/java/com/android/server/wm/WindowContainer.java
View File

@@ -2120,6 +2120,11 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
return getBounds();
}
/** Gets the position relative to parent for animation. */
void getAnimationPosition(Point outPosition) {
getRelativePosition(outPosition);
}
/**
* Applies the app transition animation according the given the layout properties in the
* window hierarchy.
@@ -2178,9 +2183,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
// Separate position and size for use in animators.
mTmpRect.set(getAnimationBounds(appStackClipMode));
if (sHierarchicalAnimations) {
getRelativePosition(mTmpPoint);
} else {
getAnimationPosition(mTmpPoint);
if (!sHierarchicalAnimations) {
// Non-hierarchical animation uses position in global coordinates.
mTmpPoint.set(mTmpRect.left, mTmpRect.top);
}
mTmpRect.offsetTo(0, 0);

26
services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java
View File

@@ -52,6 +52,7 @@ import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
import android.content.res.Configuration;
import android.graphics.Point;
import android.graphics.Rect;
import android.platform.test.annotations.Presubmit;
import android.view.IWindowManager;
@@ -432,20 +433,35 @@ public class AppWindowTokenTests extends WindowTestsBase {
removeGlobalMinSizeRestriction();
final Rect stackBounds = new Rect(0, 0, 1000, 600);
final Rect taskBounds = new Rect(100, 400, 600, 800);
mStack.setBounds(stackBounds);
mTask.setBounds(taskBounds);
// Set the bounds and windowing mode to window configuration directly, otherwise the
// testing setups may be discarded by configuration resolving.
mStack.getWindowConfiguration().setBounds(stackBounds);
mTask.getWindowConfiguration().setBounds(taskBounds);
mActivity.getWindowConfiguration().setBounds(taskBounds);
// Check that anim bounds for freeform window match task bounds
mTask.setWindowingMode(WINDOWING_MODE_FREEFORM);
mTask.getWindowConfiguration().setWindowingMode(WINDOWING_MODE_FREEFORM);
assertEquals(mTask.getBounds(), mActivity.getAnimationBounds(STACK_CLIP_NONE));
// STACK_CLIP_AFTER_ANIM should use task bounds since they will be clipped by
// bounds animation layer.
mTask.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
mTask.getWindowConfiguration().setWindowingMode(WINDOWING_MODE_FULLSCREEN);
assertEquals(mTask.getBounds(), mActivity.getAnimationBounds(STACK_CLIP_AFTER_ANIM));
// Even the activity is smaller than task and it is not aligned to the top-left corner of
// task, the animation bounds the same as task and position should be zero because in real
// case the letterbox will fill the remaining area in task.
final Rect halfBounds = new Rect(taskBounds);
halfBounds.scale(0.5f);
mActivity.getWindowConfiguration().setBounds(halfBounds);
final Point animationPosition = new Point();
mActivity.getAnimationPosition(animationPosition);
assertEquals(taskBounds, mActivity.getAnimationBounds(STACK_CLIP_AFTER_ANIM));
assertEquals(new Point(0, 0), animationPosition);
// STACK_CLIP_BEFORE_ANIM should use stack bounds since it won't be clipped later.
mTask.setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);
mTask.getWindowConfiguration().setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);
assertEquals(mStack.getBounds(), mActivity.getAnimationBounds(STACK_CLIP_BEFORE_ANIM));
}