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

Commit 96868333 authored by Craig Mautner's avatar Craig Mautner
Browse files

Recouple layout and animation a bit. 

Share state between layout and animation and stop copying
redundant data between the two.

Change-Id: If07d3fc3ddfd33e3d46bf45d24d7aca58067ee66
parent 83323f42

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

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ public class AppWindowAnimator { 
            if (w == mService.mInputMethodTarget && !mService.mInputMethodTargetWaitingAnim) {

                mService.setInputMethodAnimLayerAdjustment(adj);

            }

            if (w == mAnimator.mWallpaperTarget && mAnimator.mLowerWallpaperTarget == null) {

            if (w == mService.mWallpaperTarget && mService.mLowerWallpaperTarget == null) {

                mService.setWallpaperAnimLayerAdjustmentLocked(adj);

            }

        }

services/java/com/android/server/wm/AppWindowToken.java

+1 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.view.View; 
import android.view.WindowManager;



import java.io.PrintWriter;

import java.util.ArrayList;



/**

 * Version of WindowToken that is specifically for a particular application (or
@@ -42,7 +41,7 @@ class AppWindowToken extends WindowToken { 


    // All of the windows and child windows that are included in this

    // application token.  Note this list is NOT sorted!

    final ArrayList<WindowState> allAppWindows = new ArrayList<WindowState>();

    final WindowList allAppWindows = new WindowList();

    final AppWindowAnimator mAppAnimator;



    final WindowAnimator mAnimator;

services/java/com/android/server/wm/DisplayMagnificationMediator.java

+0 −2
Original line number Diff line number Diff line
@@ -183,8 +183,6 @@ final class DisplayMagnificationMediator extends IDisplayMagnificationMediator.S 
            displayState.mMagnificationSpec.initialize(spec.scale, spec.offsetX,

                    spec.offsetY);

            spec.recycle();

        }

        synchronized (mWindowManagerService.mLayoutToAnim) {

            mWindowManagerService.scheduleAnimationLocked();

        }

    }

services/java/com/android/server/wm/WindowAnimator.java

+73 −231

File changed.

Preview size limit exceeded, changes collapsed.

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

+100 −220

File changed.

Preview size limit exceeded, changes collapsed.