Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't halt movement notifications when display is frozen." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-22 22:17:32 +00:00
committed by Android (Google) Code Review
parent 9570466f2d c67c2a91dd
commit 6f91c19337
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -1418,7 +1418,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
*/ */
boolean hasMoved() { boolean hasMoved() {
return mHasSurface && (mContentChanged || mMovedByResize) return mHasSurface && (mContentChanged || mMovedByResize)
&& !mAnimatingExit && mService.okToDisplay() && !mAnimatingExit
&& (mFrame.top != mLastFrame.top || mFrame.left != mLastFrame.left) && (mFrame.top != mLastFrame.top || mFrame.left != mLastFrame.left)
&& (mAttachedWindow == null || !mAttachedWindow.hasMoved()); && (mAttachedWindow == null || !mAttachedWindow.hasMoved());
} }

2
services/core/java/com/android/server/wm/WindowSurfacePlacer.java
View File

@@ -721,12 +721,14 @@ class WindowSurfacePlacer {
final boolean adjustedForMinimizedDockOrIme = task != null final boolean adjustedForMinimizedDockOrIme = task != null
&& (task.mStack.isAdjustedForMinimizedDockedStack() && (task.mStack.isAdjustedForMinimizedDockedStack()
|| task.mStack.isAdjustedForIme()); || task.mStack.isAdjustedForIme());
if (mService.okToDisplay()) {
if ((w.mAttrs.privateFlags & PRIVATE_FLAG_NO_MOVE_ANIMATION) == 0 if ((w.mAttrs.privateFlags & PRIVATE_FLAG_NO_MOVE_ANIMATION) == 0
&& !w.isDragResizing() && !adjustedForMinimizedDockOrIme && !w.isDragResizing() && !adjustedForMinimizedDockOrIme
&& (task == null || w.getTask().mStack.hasMovementAnimations()) && (task == null || w.getTask().mStack.hasMovementAnimations())
&& !w.mWinAnimator.mLastHidden) { && !w.mWinAnimator.mLastHidden) {
winAnimator.setMoveAnimation(left, top); winAnimator.setMoveAnimation(left, top);
} }
}
//TODO (multidisplay): Accessibility supported only for the default display. //TODO (multidisplay): Accessibility supported only for the default display.
if (mService.mAccessibilityController != null if (mService.mAccessibilityController != null