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

Merge "Allow task fragment to use higher animation level" into sc-v2-dev

Browse Source
This commit is contained in:
Riddle Hsu
2021-07-27 13:35:34 +00:00
committed by Android (Google) Code Review
parent 138f08b5de 80e1487735
commit 5df7e13286
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/wm/Task.java
View File

@@ -180,7 +180,6 @@ import android.util.TypedXmlSerializer;
import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoOutputStream;
import android.view.DisplayInfo; import android.view.DisplayInfo;
import android.view.RemoteAnimationAdapter; import android.view.RemoteAnimationAdapter;
import android.view.RemoteAnimationTarget;
import android.view.Surface; import android.view.Surface;
import android.view.SurfaceControl; import android.view.SurfaceControl;
import android.view.WindowManager; import android.view.WindowManager;
@@ -3031,18 +3030,6 @@ class Task extends TaskFragment {
return isAnimating(CHILDREN, ANIMATION_TYPE_RECENTS); return isAnimating(CHILDREN, ANIMATION_TYPE_RECENTS);
} }
@Override
RemoteAnimationTarget createRemoteAnimationTarget(
RemoteAnimationController.RemoteAnimationRecord record) {
final ActivityRecord activity = getTopMostActivity();
return activity != null ? activity.createRemoteAnimationTarget(record) : null;
}
@Override
boolean canCreateRemoteAnimationTarget() {
return true;
}
WindowState getTopVisibleAppMainWindow() { WindowState getTopVisibleAppMainWindow() {
final ActivityRecord activity = getTopVisibleActivity(); final ActivityRecord activity = getTopVisibleActivity();
return activity != null ? activity.findMainWindow() : null; return activity != null ? activity.findMainWindow() : null;

13
services/core/java/com/android/server/wm/TaskFragment.java
View File

@@ -83,6 +83,7 @@ import android.util.DisplayMetrics;
import android.util.Slog; import android.util.Slog;
import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoOutputStream;
import android.view.DisplayInfo; import android.view.DisplayInfo;
import android.view.RemoteAnimationTarget;
import android.view.SurfaceControl; import android.view.SurfaceControl;
import android.window.ITaskFragmentOrganizer; import android.window.ITaskFragmentOrganizer;
import android.window.TaskFragmentInfo; import android.window.TaskFragmentInfo;
@@ -1487,6 +1488,18 @@ class TaskFragment extends WindowContainer<WindowContainer> {
// No app transition applied to the task fragment. // No app transition applied to the task fragment.
} }
@Override
RemoteAnimationTarget createRemoteAnimationTarget(
RemoteAnimationController.RemoteAnimationRecord record) {
final ActivityRecord activity = getTopMostActivity();
return activity != null ? activity.createRemoteAnimationTarget(record) : null;
}
@Override
boolean canCreateRemoteAnimationTarget() {
return true;
}
boolean shouldSleepActivities() { boolean shouldSleepActivities() {
return false; return false;
} }