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

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

Merge "Removed WindowState.getWindowList()"

parents 011cef54 ae9adbfb

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

+1 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.util.TimeUtils; 
import android.view.Choreographer;

import android.view.Display;

import android.view.SurfaceControl;

import android.view.WindowManagerPolicy;

import android.view.animation.Animation;

import android.view.animation.Transformation;
@@ -394,7 +393,7 @@ public class AppWindowAnimator { 
        }

        if (mService.mInputMethodTarget != null

                && mService.mInputMethodTarget.mAppToken == mAppToken) {

            mService.moveInputMethodWindowsIfNeededLocked(true);

            mAppToken.getDisplayContent().moveInputMethodWindowsIfNeeded(true);

        }



        if (DEBUG_ANIM) Slog.v(TAG, "Animation done in " + mAppToken

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

+417 −0

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM; 
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_TASK_MOVEMENT;

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

import static com.android.server.wm.WindowManagerService.H.RESIZE_STACK;

import static com.android.server.wm.WindowManagerService.LAYER_OFFSET_DIM;



import android.app.ActivityManager.StackId;

import android.content.res.Configuration;
@@ -802,8 +803,8 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye 
        if (mAnimationBackgroundAnimator == null

                || animLayer < mAnimationBackgroundAnimator.mAnimLayer) {

            mAnimationBackgroundAnimator = winAnimator;

            animLayer = mService.adjustAnimationBackground(winAnimator);

            mAnimationBackgroundSurface.show(animLayer - WindowManagerService.LAYER_OFFSET_DIM,

            animLayer = mDisplayContent.getLayerForAnimationBackground(winAnimator);

            mAnimationBackgroundSurface.show(animLayer - LAYER_OFFSET_DIM,

                    ((color >> 24) & 0xff) / 255f, 0);

        }

    }

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

+33 −380

File changed.

Preview size limit exceeded, changes collapsed.

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

+10 −68

File changed.

Preview size limit exceeded, changes collapsed.