Merge "Fix bubble shows empty content after rotating the device." into rvc-dev

This commit is contained in:
Issei Suzuki
2020-07-06 12:16:53 +00:00
committed by Android (Google) Code Review

View File

@@ -2058,7 +2058,12 @@ class ActivityStack extends Task {
if (r.mLaunchTaskBehind) { if (r.mLaunchTaskBehind) {
transit = TRANSIT_TASK_OPEN_BEHIND; transit = TRANSIT_TASK_OPEN_BEHIND;
} else if (getDisplay().isSingleTaskInstance()) { } 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; transit = TRANSIT_SHOW_SINGLE_TASK_DISPLAY;
keepCurTransition = false;
} else { } else {
// If a new task is being launched, then mark the existing top activity as // 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 // supporting picture-in-picture while pausing only if the starting activity