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

am 4d6a0df3: Merge "Do not cancel animations when switching." into jb-dev

Browse Source 
* commit '4d6a0df37930309f8e138499785483d9dcadf7d9':
  Do not cancel animations when switching.
This commit is contained in:
Craig Mautner
2012-06-12 15:48:34 -07:00
committed by Android Git Automerger
parent 05fee7bddb 4d6a0df379
commit 12f0104ec7
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3966,15 +3966,6 @@ public class WindowManagerService extends IWindowManager.Stub
} }
} }
private void cancelWindowAnimations(final AppWindowToken wtoken) {
for (int i = wtoken.windows.size() - 1; i >= 0; i--) {
final WindowStateAnimator winAnimator = wtoken.windows.get(i).mWinAnimator;
if (winAnimator.isAnimating()) {
winAnimator.clearAnimation();
}
}
}
public void executeAppTransition() { public void executeAppTransition() {
if (!checkCallingPermission(android.Manifest.permission.MANAGE_APP_TOKENS, if (!checkCallingPermission(android.Manifest.permission.MANAGE_APP_TOKENS,
"executeAppTransition()")) { "executeAppTransition()")) {
@@ -3990,12 +3981,6 @@ public class WindowManagerService extends IWindowManager.Stub
} }
if (mNextAppTransition != WindowManagerPolicy.TRANSIT_UNSET) { if (mNextAppTransition != WindowManagerPolicy.TRANSIT_UNSET) {
mAppTransitionReady = true; mAppTransitionReady = true;
for (int i = mOpeningApps.size() - 1; i >= 0; i--) {
cancelWindowAnimations(mOpeningApps.get(i));
}
for (int i = mClosingApps.size() - 1; i >= 0; i--) {
cancelWindowAnimations(mClosingApps.get(i));
}
final long origId = Binder.clearCallingIdentity(); final long origId = Binder.clearCallingIdentity();
performLayoutAndPlaceSurfacesLocked(); performLayoutAndPlaceSurfacesLocked();
Binder.restoreCallingIdentity(origId); Binder.restoreCallingIdentity(origId);
@@ -4343,7 +4328,6 @@ public class WindowManagerService extends IWindowManager.Stub
if (DEBUG_APP_TRANSITIONS) Slog.v( if (DEBUG_APP_TRANSITIONS) Slog.v(
TAG, "Setting dummy animation on: " + wtoken); TAG, "Setting dummy animation on: " + wtoken);
cancelWindowAnimations(wtoken);
wtoken.mAppAnimator.setDummyAnimation(); wtoken.mAppAnimator.setDummyAnimation();
mOpeningApps.remove(wtoken); mOpeningApps.remove(wtoken);
mClosingApps.remove(wtoken); mClosingApps.remove(wtoken);