diff options
| author | Charles Chen <charlesccchen@google.com> | 2021-08-25 10:36:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-25 10:36:28 +0000 |
| commit | 7bc4e550ed63b39e9fa32db26e5a7a88d8143228 (patch) | |
| tree | 6d638ff91aa1426e4b95be96c2e9e8c7858aaf72 /core/java/android | |
| parent | 3f2e4429cdb19813c5e0555e084205fcb7c401a5 (diff) | |
| parent | c2fc67837ee8a31a84844dd6ef267a3ccb976e64 (diff) | |
Merge "Reland "Introduce TaskFragment transition type"" into sc-v2-dev am: c2fc67837e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15638587
Change-Id: Ia76ae6c9e77455f7e9700883581206ebedbf8ca7
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/WindowManager.java | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 9b3550477aaa..329ea4a02145 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -320,6 +320,19 @@ public interface WindowManager extends ViewManager { int TRANSIT_OLD_TASK_CHANGE_WINDOWING_MODE = 27; /** + * A window in a new task fragment is being opened. + * @hide + */ + int TRANSIT_OLD_TASK_FRAGMENT_OPEN = 28; + + /** + * A window in the top-most activity of task fragment is being closed to reveal the activity + * below. + * @hide + */ + int TRANSIT_OLD_TASK_FRAGMENT_CLOSE = 29; + + /** * @hide */ @IntDef(prefix = { "TRANSIT_OLD_" }, value = { @@ -344,7 +357,9 @@ public interface WindowManager extends ViewManager { TRANSIT_OLD_TRANSLUCENT_ACTIVITY_OPEN, TRANSIT_OLD_TRANSLUCENT_ACTIVITY_CLOSE, TRANSIT_OLD_CRASHING_ACTIVITY_CLOSE, - TRANSIT_OLD_TASK_CHANGE_WINDOWING_MODE + TRANSIT_OLD_TASK_CHANGE_WINDOWING_MODE, + TRANSIT_OLD_TASK_FRAGMENT_OPEN, + TRANSIT_OLD_TASK_FRAGMENT_CLOSE }) @Retention(RetentionPolicy.SOURCE) @interface TransitionOldType {} |