Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48c84052 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 27162 into eclair 

* changes:
  Fix Activity.overridePendingTransition().
parents 35468254 8b571a81

core/java/android/app/Activity.java

+2 −2
Original line number Diff line number Diff line
@@ -3020,9 +3020,9 @@ public class Activity extends ContextThemeWrapper 
     * or {@link #finish} to specify an explicit transition animation to

     * perform next.

     * @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

     * the outgoing activity.

     * the outgoing activity.  Use 0 for no animation.

     */

    public void overridePendingTransition(int enterAnim, int exitAnim) {

        try {

services/java/com/android/server/WindowManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -9327,7 +9327,6 @@ public class WindowManagerService extends IWindowManager.Stub 
                            transit = WindowManagerPolicy.TRANSIT_UNSET;

                        }

                        mNextAppTransition = WindowManagerPolicy.TRANSIT_UNSET;

                        mNextAppTransitionPackage = null;

                        mAppTransitionReady = false;

                        mAppTransitionRunning = true;

                        mAppTransitionTimeout = false;
@@ -9484,6 +9483,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                            wtoken.allDrawn = true;

                        }



                        mNextAppTransitionPackage = null;

                        

                        mOpeningApps.clear();

                        mClosingApps.clear();