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

Commit 67e7b40f authored by Robert Carr's avatar Robert Carr
Browse files

resolve merge conflicts of c6bbbedd to master 

Change-Id: I1a82efc63aefc22a634ed48ec236a9f11b6d413c
parents 54757637 c6bbbedd

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

+2 −1
Original line number Diff line number Diff line
@@ -1084,7 +1084,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());

    }