Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9840773 authored by Mariia Sandrikova's avatar Mariia Sandrikova Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ied5f951cc3b1cbebda6f5001bf365c5c809dc867
parents c41b928f 9b60ca5d

services/core/java/com/android/server/wm/ActivityRecord.java

+4 −1
Original line number Diff line number Diff line
@@ -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();

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

+1 −0
Original line number Diff line number Diff line
@@ -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.