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

Merge "Don't clear size compat mode on fold/unfold." into sc-dev

Browse Source
This commit is contained in:
Mariia Sandrikova
2021-05-17 08:27:47 +00:00
committed by Android (Google) Code Review
parent e638648a34 437319e18b
commit 9b60ca5d02
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -7483,7 +7483,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
if (mVisibleRequested) {
// It may toggle the UI for user to restart the size compatibility mode activity.
display.handleActivitySizeCompatModeIfNeeded(this);
} else if (mCompatDisplayInsets != null) {
} else if (mCompatDisplayInsets != null && !visibleIgnoringKeyguard) {
// visibleIgnoringKeyguard is checked to avoid clearing mCompatDisplayInsets during
// displays change. Displays are turned off during the change so mVisibleRequested
// can be false.
// The override changes can only be obtained from display, because we don't have the
// difference of full configuration in each hierarchy.
final int displayChanges = display.getCurrentOverrideConfigurationChanges();

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

@@ -521,6 +521,7 @@ public class SizeCompatTests extends WindowTestsBase {
mActivity.setState(STOPPED, "testSizeCompatMode");
mActivity.mVisibleRequested = false;
mActivity.visibleIgnoringKeyguard = false;
mActivity.app.setReportedProcState(ActivityManager.PROCESS_STATE_CACHED_ACTIVITY);
// Simulate the display changes orientation.