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

am ec42c3c3: Merge "Ensure that mAllAppWinAnimators is not null." into jb-mr1-dev

Browse Source 
* commit 'ec42c3c35fd4c16e1823cfd0e5b589ed2d205aa7':
  Ensure that mAllAppWinAnimators is not null.
This commit is contained in:
Craig Mautner
2012-08-20 10:33:29 -07:00
committed by Android Git Automerger
parent 0430aab3df ec42c3c35f
commit 8f260c9a68
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/wm/AppWindowAnimator.java
View File

@@ -47,7 +47,7 @@ public class AppWindowAnimator {
final Transformation thumbnailTransformation = new Transformation();
/** WindowStateAnimator from mAppAnimator.allAppWindows as of last performLayout */
ArrayList<WindowStateAnimator> mAllAppWinAnimators;
ArrayList<WindowStateAnimator> mAllAppWinAnimators = new ArrayList<WindowStateAnimator>();
static final Animation sDummyAnimation = new DummyAnimation();

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

@@ -190,8 +190,8 @@ public class WindowAnimator {
for (int i = 0; i < N; i++) {
final AppWindowAnimParams params = layoutToAnim.mAppWindowAnimParams.get(i);
AppWindowAnimator appAnimator = params.mAppAnimator;
appAnimator.mAllAppWinAnimators =
new ArrayList<WindowStateAnimator>(params.mWinAnimators);
appAnimator.mAllAppWinAnimators.clear();
appAnimator.mAllAppWinAnimators.addAll(params.mWinAnimators);
mAppAnimators.add(appAnimator);
}
}

14
services/java/com/android/server/wm/WindowManagerService.java
View File

@@ -8367,15 +8367,23 @@ public class WindowManagerService extends IWindowManager.Stub
NN = mOpeningApps.size();
for (i=0; i<NN; i++) {
AppWindowToken wtoken = mOpeningApps.get(i);
final AppWindowAnimator appAnimator = wtoken.mAppAnimator;
if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "Now opening app" + wtoken);
wtoken.mAppAnimator.clearThumbnail();
appAnimator.clearThumbnail();
wtoken.reportedVisible = false;
wtoken.inPendingTransaction = false;
wtoken.mAppAnimator.animation = null;
appAnimator.animation = null;
setTokenVisibilityLocked(wtoken, animLp, true, transit, false);
wtoken.updateReportedVisibilityLocked();
wtoken.waitingToShow = false;
mAnimator.mAnimating |= wtoken.mAppAnimator.showAllWindowsLocked();
appAnimator.mAllAppWinAnimators.clear();
final int N = wtoken.allAppWindows.size();
for (int j = 0; j < N; j++) {
appAnimator.mAllAppWinAnimators.add(wtoken.allAppWindows.get(j).mWinAnimator);
}
mAnimator.mAnimating |= appAnimator.showAllWindowsLocked();
if (animLp != null) {
int layer = -1;
for (int j=0; j<wtoken.windows.size(); j++) {