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

Merge "Skip close activity transition since no closing app can be visible" into sc-dev am: 590ccb4e73

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

Change-Id: I2ce43931328ce728fe37d34a0417ca4afd4d32c9
This commit is contained in:
Wei Sheng Shih
2021-06-30 03:31:12 +00:00
committed by Automerger Merge Worker
parent ad53af33ae 590ccb4e73
commit f73a7fd5ab
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -412,9 +412,15 @@ public class AppTransitionController {
return TRANSIT_OLD_TASK_CLOSE; return TRANSIT_OLD_TASK_CLOSE;
} }
if (isActivityClosing) { if (isActivityClosing) {
for (int i = closingApps.size() - 1; i >= 0; i--) {
if (closingApps.valueAt(i).visibleIgnoringKeyguard) {
return TRANSIT_OLD_ACTIVITY_CLOSE; return TRANSIT_OLD_ACTIVITY_CLOSE;
} }
} }
// Skip close activity transition since no closing app can be visible
return WindowManager.TRANSIT_OLD_UNSET;
}
}
if (appTransition.containsTransitRequest(TRANSIT_RELAUNCH) if (appTransition.containsTransitRequest(TRANSIT_RELAUNCH)
&& !openingWcs.isEmpty() && !openingApps.isEmpty()) { && !openingWcs.isEmpty() && !openingApps.isEmpty()) {
return TRANSIT_OLD_ACTIVITY_RELAUNCH; return TRANSIT_OLD_ACTIVITY_RELAUNCH;

18
services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java
View File

@@ -77,6 +77,24 @@ public class AppTransitionControllerTest extends WindowTestsBase {
return r; return r;
} }
@Test
public void testSkipOccludedActivityCloseTransition() {
final ActivityRecord behind = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
final ActivityRecord topOpening = createActivityRecord(behind.getTask());
topOpening.setOccludesParent(true);
topOpening.setVisible(true);
mDisplayContent.prepareAppTransition(TRANSIT_OPEN);
mDisplayContent.prepareAppTransition(TRANSIT_CLOSE);
mDisplayContent.mClosingApps.add(behind);
assertEquals(WindowManager.TRANSIT_OLD_UNSET,
AppTransitionController.getTransitCompatType(mDisplayContent.mAppTransition,
mDisplayContent.mOpeningApps, mDisplayContent.mClosingApps,
null, null, false));
}
@Test @Test
@FlakyTest(bugId = 131005232) @FlakyTest(bugId = 131005232)
public void testTranslucentOpen() { public void testTranslucentOpen() {