diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/app/Activity.java | 4 | ||||
| -rw-r--r-- | core/java/android/app/ActivityTransitionCoordinator.java | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index def0755..3d5cae2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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(); diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 5c3433b..614d0d6 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -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(); } diff --git a/core/java/android/app/ActivityTransitionCoordinator.java b/core/java/android/app/ActivityTransitionCoordinator.java index 5fae3be..7617886 100644 --- a/core/java/android/app/ActivityTransitionCoordinator.java +++ b/core/java/android/app/ActivityTransitionCoordinator.java @@ -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 |