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

Merge "Skip letterboxing if the activity below is embedded" into tm-qpr-dev

Browse Source
This commit is contained in:
Charles Chen
2023-05-10 01:47:04 +00:00
committed by Android (Google) Code Review
parent 52521e07bf ad7d89c22b
commit 53b8173a0d
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/LetterboxUiController.java
View File

@@ -1595,9 +1595,9 @@ final class LetterboxUiController {
FIRST_OPAQUE_NOT_FINISHING_ACTIVITY_PREDICATE /* callback */, FIRST_OPAQUE_NOT_FINISHING_ACTIVITY_PREDICATE /* callback */,
mActivityRecord /* boundary */, false /* includeBoundary */, mActivityRecord /* boundary */, false /* includeBoundary */,
true /* traverseTopToBottom */); true /* traverseTopToBottom */);
if (firstOpaqueActivityBeneath == null) { if (firstOpaqueActivityBeneath == null || firstOpaqueActivityBeneath.isEmbedded()) {
// We skip letterboxing if the translucent activity doesn't have any opaque // We skip letterboxing if the translucent activity doesn't have any opaque
// activities beneath // activities beneath or the activity below is embedded which never has letterbox.
return; return;
} }
inheritConfiguration(firstOpaqueActivityBeneath); inheritConfiguration(firstOpaqueActivityBeneath);

20
services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java
View File

@@ -475,7 +475,25 @@ public class SizeCompatTests extends WindowTestsBase {
} }
@Test @Test
public void testTranslucentActivitiesDontGoInSizeCompatMode() { public void testNotApplyStrategyToTranslucentActivitiesOverEmbeddedActivities() {
mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);
setUpDisplaySizeWithApp(2000, 1000);
mActivity.info.screenOrientation = SCREEN_ORIENTATION_PORTRAIT;
mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);
// Mock the activity as embedded without additional TaskFragment layer in the task for
// simplicity.
doReturn(true).when(mActivity).isEmbedded();
// Translucent Activity
final ActivityRecord translucentActivity = new ActivityBuilder(mAtm).build();
doReturn(false).when(translucentActivity).matchParentBounds();
doReturn(false).when(translucentActivity).fillsParent();
mTask.addChild(translucentActivity);
// Check the strategy has not being applied
assertFalse(translucentActivity.mLetterboxUiController.hasInheritedLetterboxBehavior());
}
@Test
public void testTranslucentActivitiesDontGoInSizeCompactMode() {
mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true); mWm.mLetterboxConfiguration.setTranslucentLetterboxingOverrideEnabled(true);
setUpDisplaySizeWithApp(2800, 1400); setUpDisplaySizeWithApp(2800, 1400);
mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */); mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);