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

am 34a75df6: Merge "Remove single pass actions from display loop." into jb-mr1-dev

Browse Source 
* commit '34a75df63533914bbca95a82d2c89ca374b2645d':
  Remove single pass actions from display loop.
This commit is contained in:
Craig Mautner
2012-09-04 12:35:35 -07:00
committed by Android Git Automerger
parent fed542f16c 34a75df635
commit 0f3428f3b9
2 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/wm/DimAnimator.java
View File

@@ -212,5 +212,12 @@ class DimAnimator {
mDimHeight = dimHeight;
mDimTarget = dimTarget;
}
Parameters(Parameters o) {
mDimWinAnimator = o.mDimWinAnimator;
mDimWidth = o.mDimWidth;
mDimHeight = o.mDimHeight;
mDimTarget = o.mDimTarget;
}
}
}

53
services/java/com/android/server/wm/WindowAnimator.java
View File

@@ -176,7 +176,7 @@ public class WindowAnimator {
// Set the new DimAnimator params.
DimAnimator.Parameters dimParams = layoutToAnim.mDimParams;
if (dimParams == null) {
mDimParams = dimParams;
mDimParams = null;
} else {
final WindowStateAnimator newWinAnimator = dimParams.mDimWinAnimator;
@@ -187,7 +187,7 @@ public class WindowAnimator {
if (newWinAnimator.mSurfaceShown &&
(existingDimWinAnimator == null || !existingDimWinAnimator.mSurfaceShown
|| existingDimWinAnimator.mAnimLayer < newWinAnimator.mAnimLayer)) {
mDimParams = dimParams;
mDimParams = new DimAnimator.Parameters(dimParams);
}
}
@@ -559,15 +559,6 @@ public class WindowAnimator {
private void performAnimationsLocked(final WinAnimatorList winAnimatorList) {
updateWindowsLocked(winAnimatorList);
updateWallpaperLocked(winAnimatorList);
for (int i = mPendingLayoutChanges.size() - 1; i >= 0; i--) {
if ((mPendingLayoutChanges.valueAt(i)
& WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER) != 0) {
mPendingActions |= WALLPAPER_ACTION_PENDING;
}
}
testTokenMayBeDrawnLocked();
}
// TODO(cmautner): Change the following comment when no longer locked on mWindowMap */
@@ -576,12 +567,7 @@ public class WindowAnimator {
if (!mInitialized) {
return;
}
for (int i = mWinAnimatorLists.size() - 1; i >= 0; i--) {
animateLocked(mWinAnimatorLists.get(i));
}
}
private void animateLocked(final WinAnimatorList winAnimatorList) {
mPendingLayoutChanges.clear();
mCurrentTime = SystemClock.uptimeMillis();
mBulkUpdateParams = SET_ORIENTATION_CHANGE_COMPLETE;
@@ -591,25 +577,31 @@ public class WindowAnimator {
Slog.i(TAG, "!!! animate: entry time=" + mCurrentTime);
}
// Update animations of all applications, including those
// associated with exiting/removed apps
if (WindowManagerService.SHOW_TRANSACTIONS) Slog.i(
TAG, ">>> OPEN TRANSACTION animateLocked");
Surface.openTransaction();
try {
updateWindowsAppsAndRotationAnimationsLocked();
performAnimationsLocked(winAnimatorList);
// THIRD LOOP: Update the surfaces of all windows.
for (int i = mWinAnimatorLists.size() - 1; i >= 0; i--) {
final WinAnimatorList winAnimatorList = mWinAnimatorLists.get(i);
// Update animations of all applications, including those
// associated with exiting/removed apps
performAnimationsLocked(winAnimatorList);
final int N = winAnimatorList.size();
for (int j = 0; j < N; j++) {
winAnimatorList.get(j).prepareSurfaceLocked(true);
}
}
testTokenMayBeDrawnLocked();
if (mScreenRotationAnimation != null) {
mScreenRotationAnimation.updateSurfacesInTransaction();
}
final int N = winAnimatorList.size();
for (int i = 0; i < N; i++) {
winAnimatorList.get(i).prepareSurfaceLocked(true);
}
if (mDimParams != null) {
mDimAnimator.updateParameters(mContext.getResources(), mDimParams, mCurrentTime);
}
@@ -634,6 +626,15 @@ public class WindowAnimator {
Log.wtf(TAG, "Unhandled exception in Window Manager", e);
} finally {
Surface.closeTransaction();
if (WindowManagerService.SHOW_TRANSACTIONS) Slog.i(
TAG, "<<< CLOSE TRANSACTION animateLocked");
}
for (int i = mPendingLayoutChanges.size() - 1; i >= 0; i--) {
if ((mPendingLayoutChanges.valueAt(i)
& WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER) != 0) {
mPendingActions |= WALLPAPER_ACTION_PENDING;
}
}
if (mBulkUpdateParams != 0 || mPendingLayoutChanges.size() > 0) {