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

Commit 4ee35806 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Change method name per API council request"

parents bee9d712 73f843de

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3214,9 +3214,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
@@ -2446,7 +2446,7 @@ public class Activity extends ContextThemeWrapper 
     */

    public void onBackPressed() {

        if (!mFragments.popBackStackImmediate()) {

            finishWithTransition();

            finishAfterTransition();

        }

    }
@@ -4552,7 +4552,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