Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bubble shows empty contents after rotating the device." into rvc-dev am: 35cd1a6a87

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12098183

Change-Id: Iaf4f8e7c54e851727ad0a40e60a2a8364875eff3
This commit is contained in:
Issei Suzuki
2020-07-08 07:24:07 +00:00
committed by Automerger Merge Worker
parent 54e6bc1dbb 35cd1a6a87
commit adf2eec803
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/wm/ActivityStack.java
View File

@@ -2443,7 +2443,7 @@ class ActivityStack extends Task {
forAllActivities(ActivityRecord::removeLaunchTickRunnable); forAllActivities(ActivityRecord::removeLaunchTickRunnable);
} }
private void updateTransitLocked(int transit, ActivityOptions options) { private void updateTransitLocked(int transit, ActivityOptions options, boolean forceOverride) {
if (options != null) { if (options != null) {
ActivityRecord r = topRunningActivity(); ActivityRecord r = topRunningActivity();
if (r != null && !r.isState(RESUMED)) { if (r != null && !r.isState(RESUMED)) {
@@ -2452,7 +2452,8 @@ class ActivityStack extends Task {
ActivityOptions.abort(options); ActivityOptions.abort(options);
} }
} }
getDisplay().mDisplayContent.prepareAppTransition(transit, false); getDisplay().mDisplayContent.prepareAppTransition(transit, false,
0 /* flags */, forceOverride);
} }
final void moveTaskToFront(Task tr, boolean noAnimation, ActivityOptions options, final void moveTaskToFront(Task tr, boolean noAnimation, ActivityOptions options,
@@ -2472,8 +2473,17 @@ class ActivityStack extends Task {
// nothing to do! // nothing to do!
if (noAnimation) { if (noAnimation) {
ActivityOptions.abort(options); ActivityOptions.abort(options);
} else if (isSingleTaskInstance()) {
// When a task is moved front on the display which can only contain one task, start
// a special transition.
// {@link AppTransitionController#handleAppTransitionReady} later picks up the
// transition, and schedules
// {@link ITaskStackListener#onSingleTaskDisplayDrawn} callback which is triggered
// after contents are drawn on the display.
updateTransitLocked(TRANSIT_SHOW_SINGLE_TASK_DISPLAY, options,
true /* forceOverride */);
} else { } else {
updateTransitLocked(TRANSIT_TASK_TO_FRONT, options); updateTransitLocked(TRANSIT_TASK_TO_FRONT, options, false /* forceOverride */);
} }
return; return;
} }
@@ -2519,9 +2529,13 @@ class ActivityStack extends Task {
mStackSupervisor.mNoAnimActivities.add(r); mStackSupervisor.mNoAnimActivities.add(r);
} }
ActivityOptions.abort(options); ActivityOptions.abort(options);
} else if (isSingleTaskInstance()) {
updateTransitLocked(TRANSIT_SHOW_SINGLE_TASK_DISPLAY, options,
true /* forceOverride */);
} else { } else {
updateTransitLocked(TRANSIT_TASK_TO_FRONT, options); updateTransitLocked(TRANSIT_TASK_TO_FRONT, options, false /* forceOverride */);
} }
// If a new task is moved to the front, then mark the existing top activity as // If a new task is moved to the front, then mark the existing top activity as
// supporting // supporting

3
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -2375,7 +2375,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
// triggered after contents are drawn on the display. // triggered after contents are drawn on the display.
if (display.isSingleTaskInstance()) { if (display.isSingleTaskInstance()) {
display.mDisplayContent.prepareAppTransition( display.mDisplayContent.prepareAppTransition(
TRANSIT_SHOW_SINGLE_TASK_DISPLAY, false); TRANSIT_SHOW_SINGLE_TASK_DISPLAY, false,
0 /* flags */, true /* forceOverride*/);
} }
stack.awakeFromSleepingLocked(); stack.awakeFromSleepingLocked();
if (display.isSingleTaskInstance()) { if (display.isSingleTaskInstance()) {