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

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

Merge "resolve merge conflicts of c6bbbedd to master"

parents 42ed4974 67e7b40f

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

+2 −1
Original line number Diff line number Diff line
@@ -1088,7 +1088,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> { 
                    final boolean adjustedForMinimizedDockOrIme = task != null

                            && (task.mStack.isAdjustedForMinimizedDockedStack()

                            || task.mStack.isAdjustedForIme());

                    if ((w.mAttrs.privateFlags & PRIVATE_FLAG_NO_MOVE_ANIMATION) == 0

                    if (mService.okToDisplay()

                            && (w.mAttrs.privateFlags & PRIVATE_FLAG_NO_MOVE_ANIMATION) == 0

                            && !w.isDragResizing() && !adjustedForMinimizedDockOrIme

                            && (task == null || w.getTask().mStack.hasMovementAnimations())

                            && !w.mWinAnimator.mLastHidden) {

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

+1 −1
Original line number Diff line number Diff line
@@ -1562,7 +1562,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
     */

    boolean hasMoved() {

        return mHasSurface && (mContentChanged || mMovedByResize)

                && !mAnimatingExit && mService.okToDisplay()

                && !mAnimatingExit

                && (mFrame.top != mLastFrame.top || mFrame.left != mLastFrame.left)

                && (!mIsChildWindow || !getParentWindow().hasMoved());

    }