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

am 48c84052: Merge change 27162 into eclair

Browse Source 
Merge commit '48c84052e25c1ac1cdb6c86ac2d231d40a7801af' into eclair-plus-aosp

* commit '48c84052e25c1ac1cdb6c86ac2d231d40a7801af':
  Fix Activity.overridePendingTransition().
This commit is contained in:
Dianne Hackborn
2009-09-25 16:21:02 -07:00
committed by Android Git Automerger
parent 9a9b97d3a9 48c84052e2
commit 7bae17c6de
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/Activity.java
View File

@@ -3020,9 +3020,9 @@ public class Activity extends ContextThemeWrapper
* or {@link #finish} to specify an explicit transition animation to * or {@link #finish} to specify an explicit transition animation to
* perform next. * perform next.
* @param enterAnim A resource ID of the animation resource to use for * @param enterAnim A resource ID of the animation resource to use for
* the incoming activity. * the incoming activity. Use 0 for no animation.
* @param exitAnim A resource ID of the animation resource to use for * @param exitAnim A resource ID of the animation resource to use for
* the outgoing activity. * the outgoing activity. Use 0 for no animation.
*/ */
public void overridePendingTransition(int enterAnim, int exitAnim) { public void overridePendingTransition(int enterAnim, int exitAnim) {
try { try {

5
services/java/com/android/server/WindowManagerService.java
View File

@@ -3122,7 +3122,7 @@ public class WindowManagerService extends IWindowManager.Stub
public void overridePendingAppTransition(String packageName, public void overridePendingAppTransition(String packageName,
int enterAnim, int exitAnim) { int enterAnim, int exitAnim) {
if (mNextAppTransition != WindowManagerPolicy.TRANSIT_UNSET){ if (mNextAppTransition != WindowManagerPolicy.TRANSIT_UNSET) {
mNextAppTransitionPackage = packageName; mNextAppTransitionPackage = packageName;
mNextAppTransitionEnter = enterAnim; mNextAppTransitionEnter = enterAnim;
mNextAppTransitionExit = exitAnim; mNextAppTransitionExit = exitAnim;
@@ -9327,7 +9327,6 @@ public class WindowManagerService extends IWindowManager.Stub
transit = WindowManagerPolicy.TRANSIT_UNSET; transit = WindowManagerPolicy.TRANSIT_UNSET;
} }
mNextAppTransition = WindowManagerPolicy.TRANSIT_UNSET; mNextAppTransition = WindowManagerPolicy.TRANSIT_UNSET;
mNextAppTransitionPackage = null;
mAppTransitionReady = false; mAppTransitionReady = false;
mAppTransitionRunning = true; mAppTransitionRunning = true;
mAppTransitionTimeout = false; mAppTransitionTimeout = false;
@@ -9484,6 +9483,8 @@ public class WindowManagerService extends IWindowManager.Stub
wtoken.allDrawn = true; wtoken.allDrawn = true;
} }
mNextAppTransitionPackage = null;
mOpeningApps.clear(); mOpeningApps.clear();
mClosingApps.clear(); mClosingApps.clear();