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

Commit 73f843de authored by Craig Mautner's avatar Craig Mautner
Browse files

Change method name per API council request 

Activity.finishWithTransition() => finishAfterTransition().

Fixes bug 14997477.

Change-Id: I517f70b3bd6df9962f4bb2acf282e4b9fa91acde
parent dce9443f

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3210,9 +3210,9 @@ package android.app { 
    method public void finishActivity(int);

    method public void finishActivityFromChild(android.app.Activity, int);

    method public void finishAffinity();

    method public void finishAfterTransition();

    method public void finishAndRemoveTask();

    method public void finishFromChild(android.app.Activity);

    method public void finishWithTransition();

    method public android.app.ActionBar getActionBar();

    method public final android.app.Application getApplication();

    method public android.content.ComponentName getCallingActivity();

core/java/android/app/Activity.java

+2 −2
Original line number Diff line number Diff line
@@ -2444,7 +2444,7 @@ public class Activity extends ContextThemeWrapper 
     */

    public void onBackPressed() {

        if (!mFragments.popBackStackImmediate()) {

            finishWithTransition();

            finishAfterTransition();

        }

    }
@@ -4550,7 +4550,7 @@ public class Activity extends ContextThemeWrapper 
     * immediately and the Activity exit Transition is run.

     * @see android.app.ActivityOptions#makeSceneTransitionAnimation(Activity, android.util.Pair[])

     */

    public void finishWithTransition() {

    public void finishAfterTransition() {

        if (!mActivityTransitionState.startExitBackTransition(this)) {

            finish();

        }

core/java/android/app/ActivityTransitionCoordinator.java

+2 −2
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ import java.util.Collection; 
 * 10) The calling Activity gets an onStop() call

 *    - onActivityStopped() is called and all exited Views are made VISIBLE.

 *

 * Typical finishWithTransition goes like this:

 * 1) finishWithTransition() creates an ExitTransitionCoordinator and calls startExit()

 * Typical finishAfterTransition goes like this:

 * 1) finishAfterTransition() creates an ExitTransitionCoordinator and calls startExit()

 *    - The Window start transitioning to Translucent with a new ActivityOptions.

 *    - If no background exists, a black background is substituted

 *    - The shared elements in the scene are matched against those shared elements