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

Merge "Fix blocking task switch when 3P launcher is used." into tm-qpr-dev

Browse Source
This commit is contained in:
Issei Suzuki
2022-11-23 14:00:45 +00:00
committed by Android (Google) Code Review
parent 39e905c3a2 1672431e47
commit b7b84320d4
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/AppTransitionController.java
View File

@@ -1229,13 +1229,23 @@ public class AppTransitionController {
"Delaying app transition for screen rotation animation to finish"); "Delaying app transition for screen rotation animation to finish");
return false; return false;
} }
final boolean isRecentsInOpening = mDisplayContent.mOpeningApps.stream().anyMatch(
ConfigurationContainer::isActivityTypeRecents);
for (int i = 0; i < apps.size(); i++) { for (int i = 0; i < apps.size(); i++) {
WindowContainer wc = apps.valueAt(i); WindowContainer wc = apps.valueAt(i);
final ActivityRecord activity = getAppFromContainer(wc); final ActivityRecord activity = getAppFromContainer(wc);
if (activity == null) { if (activity == null) {
continue; continue;
} }
if (activity.isAnimating(PARENTS, ANIMATION_TYPE_RECENTS)) { // In order to avoid visual clutter caused by a conflict between app transition
// animation and recents animation, app transition is delayed until recents finishes.
// One exceptional case. When 3P launcher is used and a user taps a task screenshot in
// task switcher (isRecentsInOpening=true), app transition must start even though
// recents is running. Otherwise app transition is blocked until timeout (b/232984498).
// When 1P launcher is used, this animation is controlled by the launcher outside of
// the app transition, so delaying app transition doesn't cause visible delay. After
// recents finishes, app transition is handled just to commit visibility on apps.
if (!isRecentsInOpening && activity.isAnimating(PARENTS, ANIMATION_TYPE_RECENTS)) {
ProtoLog.v(WM_DEBUG_APP_TRANSITIONS, ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
"Delaying app transition for recents animation to finish"); "Delaying app transition for recents animation to finish");
return false; return false;