summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorIssei Suzuki <issei@google.com>2020-11-18 17:07:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-11-18 17:07:39 +0000
commit30ce5da1bce752aa0156e62b1f9cf277428a8d77 (patch)
tree44ded3708162b90d9848dc1d81faa6cdfe784941 /core/java/android
parentf474b7835fa9776146421eabb0bde505dace6bb5 (diff)
parentc4ab2ccaaf105167c719bb1768a07f6b590a1d08 (diff)
Merge changes Ia2f99fa3,I4320b04d
* changes: Replace old app transition type to new transition type (3/N) Replace old app transition type to new transition type (2/N)
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/WindowManager.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 72f76d1a9dc9..436acef17c4d 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -410,6 +410,13 @@ public interface WindowManager extends ViewManager {
int TRANSIT_FLAG_APP_CRASHED = 0x10;
/**
+ * Transition flag: A window in a new task is being opened behind an existing one in another
+ * activity's task.
+ * @hide
+ */
+ int TRANSIT_FLAG_OPEN_BEHIND = 0x20;
+
+ /**
* @hide
*/
@IntDef(flag = true, prefix = { "TRANSIT_FLAG_" }, value = {
@@ -417,7 +424,8 @@ public interface WindowManager extends ViewManager {
TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION,
TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER,
TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION,
- TRANSIT_FLAG_APP_CRASHED
+ TRANSIT_FLAG_APP_CRASHED,
+ TRANSIT_FLAG_OPEN_BEHIND
})
@Retention(RetentionPolicy.SOURCE)
@interface TransitionFlags {}