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

Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev

Browse Source
This commit is contained in:
Chong Zhang
2016-05-18 20:57:29 +00:00
committed by Android (Google) Code Review
parent 7e745ec49c cbbcc0f795
commit ff8ceadfc8
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2115,14 +2115,16 @@ final class WindowState implements WindowManagerPolicy.WindowState {
mWasVisibleBeforeClientHidden = false; mWasVisibleBeforeClientHidden = false;
} }
void clearAnimatingWithSavedSurface() { boolean clearAnimatingWithSavedSurface() {
if (mAnimatingWithSavedSurface) { if (mAnimatingWithSavedSurface) {
// App has drawn something to its windows, we're no longer animating with // App has drawn something to its windows, we're no longer animating with
// the saved surfaces. // the saved surfaces.
if (DEBUG_ANIM) Slog.d(TAG, if (DEBUG_ANIM) Slog.d(TAG,
"clearAnimatingWithSavedSurface(): win=" + this); "clearAnimatingWithSavedSurface(): win=" + this);
mAnimatingWithSavedSurface = false; mAnimatingWithSavedSurface = false;
return true;
} }
return false;
} }
@Override @Override

6
services/core/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -585,7 +585,7 @@ class WindowStateAnimator {
+ drawStateToString()); + drawStateToString());
} }
mWin.clearAnimatingWithSavedSurface(); boolean layoutNeeded = mWin.clearAnimatingWithSavedSurface();
if (mDrawState == DRAW_PENDING) { if (mDrawState == DRAW_PENDING) {
if (DEBUG_SURFACE_TRACE || DEBUG_ANIM || SHOW_TRANSACTIONS || DEBUG_ORIENTATION) if (DEBUG_SURFACE_TRACE || DEBUG_ANIM || SHOW_TRANSACTIONS || DEBUG_ORIENTATION)
@@ -595,10 +595,10 @@ class WindowStateAnimator {
Slog.v(TAG, "Draw state now committed in " + mWin); Slog.v(TAG, "Draw state now committed in " + mWin);
} }
mDrawState = COMMIT_DRAW_PENDING; mDrawState = COMMIT_DRAW_PENDING;
return true; layoutNeeded = true;
} }
return false; return layoutNeeded;
} }
// This must be called while inside a transaction. // This must be called while inside a transaction.