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

Commit 51d7a8a8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move rotation methods to DisplayContent"

parents 2e5bb007 06d07d6c

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;