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

Merge "[Shell-transition]: More checking animating state methods" into tm-dev am: 1a337e9ce5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16938655

Change-Id: Ie9eba840863705718516ea2eb211cedd3310f349
This commit is contained in:
TreeHugger Robot
2022-03-01 10:51:02 +00:00
committed by Automerger Merge Worker
parent acfe676769 1a337e9ce5
commit 05847140f2
4 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3248,7 +3248,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
// the best capture timing (e.g. IME window capture),
// No need additional task capture while task is controlled by RecentsAnimation.
if (mAtmService.mWindowManager.mTaskSnapshotController != null
&& !task.isAnimatingByRecents()) {
&& !(task.isAnimatingByRecents()
|| mTransitionController.inRecentsTransition(task))) {
final ArraySet<Task> tasks = Sets.newArraySet(task);
mAtmService.mWindowManager.mTaskSnapshotController.snapshotTasks(tasks);
mAtmService.mWindowManager.mTaskSnapshotController

9
services/core/java/com/android/server/wm/TaskSnapshotController.java
View File

@@ -534,7 +534,7 @@ class TaskSnapshotController {
// Since RecentsAnimation will handle task snapshot while switching apps with the
// best capture timing (e.g. IME window capture),
// No need additional task capture while task is controlled by RecentsAnimation.
if (task.isAnimatingByRecents()) {
if (isAnimatingByRecents(task)) {
mSkipClosingAppSnapshotTasks.add(task);
}
// If the task of the app is not visible anymore, it means no other app in that task
@@ -686,7 +686,7 @@ class TaskSnapshotController {
// Since RecentsAnimation will handle task snapshot while switching apps with the best
// capture timing (e.g. IME window capture), No need additional task capture while task
// is controlled by RecentsAnimation.
if (task.isVisible() && !task.isAnimatingByRecents()) {
if (task.isVisible() && !isAnimatingByRecents(task)) {
mTmpTasks.add(task);
}
});
@@ -717,6 +717,11 @@ class TaskSnapshotController {
frame, Type.systemBars(), false /* ignoreVisibility */).toRect();
}
private boolean isAnimatingByRecents(@NonNull Task task) {
return task.isAnimatingByRecents()
|| mService.mAtmService.getTransitionController().inRecentsTransition(task);
}
void dump(PrintWriter pw, String prefix) {
pw.println(prefix + "mHighResTaskSnapshotScale=" + mHighResTaskSnapshotScale);
pw.println(prefix + "mTaskSnapshotEnabled=" + mTaskSnapshotEnabled);

24
services/core/java/com/android/server/wm/TransitionController.java
View File

@@ -245,7 +245,7 @@ class TransitionController {
/** @return {@code true} if wc is in a participant subtree */
boolean inTransition(@NonNull WindowContainer wc) {
if (isCollecting(wc)) return true;
if (isCollecting(wc)) return true;
for (int i = mPlayingTransitions.size() - 1; i >= 0; --i) {
for (WindowContainer p = wc; p != null; p = p.getParent()) {
if (mPlayingTransitions.get(i).mParticipants.contains(p)) {
@@ -256,6 +256,28 @@ class TransitionController {
return false;
}
boolean inRecentsTransition(@NonNull WindowContainer wc) {
for (WindowContainer p = wc; p != null; p = p.getParent()) {
// TODO(b/221417431): replace this with deterministic snapshots
if (mCollectingTransition == null) break;
if ((mCollectingTransition.getFlags() & TRANSIT_FLAG_IS_RECENTS) != 0
&& mCollectingTransition.mParticipants.contains(wc)) {
return true;
}
}
for (int i = mPlayingTransitions.size() - 1; i >= 0; --i) {
for (WindowContainer p = wc; p != null; p = p.getParent()) {
// TODO(b/221417431): replace this with deterministic snapshots
if ((mPlayingTransitions.get(i).getFlags() & TRANSIT_FLAG_IS_RECENTS) != 0
&& mPlayingTransitions.get(i).mParticipants.contains(p)) {
return true;
}
}
}
return false;
}
/** @return {@code true} if wc is in a participant subtree */
boolean isTransitionOnDisplay(@NonNull DisplayContent dc) {
if (mCollectingTransition != null && mCollectingTransition.isOnDisplay(dc)) {

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

@@ -47,6 +47,7 @@ import static com.android.server.wm.IdentifierProto.TITLE;
import static com.android.server.wm.IdentifierProto.USER_ID;
import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_ALL;
import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;
import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS;
import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN;
import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;
import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;
@@ -1173,6 +1174,27 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
return mTransitionController.inTransition(this);
}
boolean inAppOrRecentsTransition() {
if (!mTransitionController.isShellTransitionsEnabled()) {
return isAnimating(PARENTS | TRANSITION,
ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_RECENTS);
}
for (WindowContainer p = this; p != null; p = p.getParent()) {
if (mTransitionController.isCollecting(p)) {
return true;
}
}
if (inTransition() || mTransitionController.inRecentsTransition(this)) return true;
for (int i = mChildren.size() - 1; i >= 0; --i) {
WindowContainer child = mChildren.get(i);
if (child.inAppOrRecentsTransition()) {
return true;
}
}
return false;
}
void sendAppVisibilityToClients() {
for (int i = mChildren.size() - 1; i >= 0; --i) {
final WindowContainer wc = mChildren.get(i);