summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorCharles Chen <charlesccchen@google.com>2021-08-25 10:23:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-08-25 10:23:48 +0000
commitc2fc67837ee8a31a84844dd6ef267a3ccb976e64 (patch)
tree7b9a511135292e58f31ca4e25d86827e3e286651 /core/java
parentc131bc926e92b20062dffaf184c337ad646ec741 (diff)
parent5e55e3976d207b20c00270a8579adffa5aa79bb7 (diff)
Merge "Reland "Introduce TaskFragment transition type"" into sc-v2-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/WindowManager.java17
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 {}