diff options
| author | 2020-07-06 12:43:59 +0000 | |
|---|---|---|
| committer | 2020-07-06 12:43:59 +0000 | |
| commit | 5fa13fcbf307660d85f8dbc3b1e9045f3b6aca37 (patch) | |
| tree | 9a07c1d4a636852b7bc18027a8836e42b41d1eae | |
| parent | 235ab961699dec70d6fe94c3cd461cbfc09a37f9 (diff) | |
| parent | 32f4fcdf746fec3560b2618dea479aa3479d831d (diff) | |
Merge "Fix bubble shows empty content after rotating the device." into rvc-dev am: e8a51880b5 am: 32f4fcdf74
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12070365
Change-Id: Ie345e3ea74e8004e24827b438d88b47155b597a7
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityStack.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java index 8f0de7312ee5..225c2094fd39 100644 --- a/services/core/java/com/android/server/wm/ActivityStack.java +++ b/services/core/java/com/android/server/wm/ActivityStack.java @@ -2058,7 +2058,12 @@ class ActivityStack extends Task { if (r.mLaunchTaskBehind) { transit = TRANSIT_TASK_OPEN_BEHIND; } else if (getDisplay().isSingleTaskInstance()) { + // If a new task is being launched in a single task display, we don't need + // to play normal animation, but need to trigger a callback when an app + // transition is actually handled. So ignore already prepared activity, and + // override it. transit = TRANSIT_SHOW_SINGLE_TASK_DISPLAY; + keepCurTransition = false; } else { // If a new task is being launched, then mark the existing top activity as // supporting picture-in-picture while pausing only if the starting activity |