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

am 1dee8974: Merge "Track animating apps up until animation starts." into jb-dev

Browse Source 
* commit '1dee8974693fff55e276e0aed1202e43904bb944':
  Track animating apps up until animation starts.
This commit is contained in:
Craig Mautner
2012-05-29 11:48:45 -07:00
committed by Android Git Automerger
parent bd817711d7 1dee897469
commit dfcdde7902
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3544,7 +3544,8 @@ public class WindowManagerService extends IWindowManager.Stub
wtoken.groupId = groupId; wtoken.groupId = groupId;
wtoken.appFullscreen = fullscreen; wtoken.appFullscreen = fullscreen;
wtoken.requestedOrientation = requestedOrientation; wtoken.requestedOrientation = requestedOrientation;
if (DEBUG_TOKEN_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(TAG, "addAppToken: " + wtoken); if (DEBUG_TOKEN_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(TAG, "addAppToken: " + wtoken
+ " at " + addPos);
mAppTokens.add(addPos, wtoken); mAppTokens.add(addPos, wtoken);
addAppTokenToAnimating(addPos, wtoken); addAppTokenToAnimating(addPos, wtoken);
mTokenMap.put(token.asBinder(), wtoken); mTokenMap.put(token.asBinder(), wtoken);
@@ -4816,8 +4817,7 @@ public class WindowManagerService extends IWindowManager.Stub
} }
} }
if (mNextAppTransition == WindowManagerPolicy.TRANSIT_UNSET if (!mAppTransitionRunning) {
&& !mAppTransitionRunning) {
mAnimatingAppTokens.clear(); mAnimatingAppTokens.clear();
mAnimatingAppTokens.addAll(mAppTokens); mAnimatingAppTokens.addAll(mAppTokens);
moveAppWindowsLocked(tokens, mAppTokens.size()); moveAppWindowsLocked(tokens, mAppTokens.size());
@@ -4836,8 +4836,7 @@ public class WindowManagerService extends IWindowManager.Stub
final long origId = Binder.clearCallingIdentity(); final long origId = Binder.clearCallingIdentity();
synchronized(mWindowMap) { synchronized(mWindowMap) {
final int N = tokens.size(); final int N = tokens.size();
if (N > 0 && mNextAppTransition != WindowManagerPolicy.TRANSIT_UNSET if (N > 0 && !mAppTransitionRunning) {
&& !mAppTransitionRunning) {
// animating towards back, hang onto old list for duration of animation. // animating towards back, hang onto old list for duration of animation.
mAnimatingAppTokens.clear(); mAnimatingAppTokens.clear();
mAnimatingAppTokens.addAll(mAppTokens); mAnimatingAppTokens.addAll(mAppTokens);
@@ -4857,8 +4856,7 @@ public class WindowManagerService extends IWindowManager.Stub
} }
} }
if (mNextAppTransition == WindowManagerPolicy.TRANSIT_UNSET if (!mAppTransitionRunning) {
&& !mAppTransitionRunning) {
mAnimatingAppTokens.clear(); mAnimatingAppTokens.clear();
mAnimatingAppTokens.addAll(mAppTokens); mAnimatingAppTokens.addAll(mAppTokens);
moveAppWindowsLocked(tokens, 0); moveAppWindowsLocked(tokens, 0);