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

Commit 06d07d6c authored by Andrii Kulian's avatar Andrii Kulian
Browse files

Move rotation methods to DisplayContent 

This moves some of the rotation logic applied to displays
from WindowManagerService to DisplayContent. No changes in
logic.

Bug: 34242678
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testRotationNotAffectingSecondaryScreen
Test: android.server.cts.ActivityManagerAppConfigurationTests
Change-Id: Ica8b5d700dea82edfc6b51b10be3362fc89854b0
parent dc61d1b2

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

+534 −3

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −3
Original line number Diff line number Diff line
@@ -55,13 +55,11 @@ import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM; 
import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT;

import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;



import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_DISPLAY;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_KEEP_SCREEN_ON;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT_REPEATS;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ORIENTATION;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_POWER;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_TOKEN_MOVEMENT;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_VISIBILITY;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WALLPAPER_LIGHT;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WINDOW_TRACE;
@@ -740,7 +738,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> { 
            if (DEBUG_ORIENTATION) Slog.d(TAG, "Performing post-rotate rotation");

            // TODO(multi-display): Update rotation for different displays separately.

            final int displayId = defaultDisplay.getDisplayId();

            if (mService.updateRotationUncheckedLocked(false, displayId)) {

            if (defaultDisplay.updateRotationUnchecked(false /* inTransaction */)) {

                mService.mH.obtainMessage(SEND_NEW_CONFIGURATION, displayId).sendToTarget();

            } else {

                mUpdateRotation = false;

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

+25 −537

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −2
Original line number Diff line number Diff line
@@ -1273,7 +1273,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 


    void prelayout() {

        if (mEnforceSizeCompat) {

            mGlobalScale = mService.mCompatibleScreenScale;

            mGlobalScale = getDisplayContent().mCompatibleScreenScale;

            mInvGlobalScale = 1 / mGlobalScale;

        } else {

            mGlobalScale = mInvGlobalScale = 1;