diff options
| author | Craig Mautner <cmautner@google.com> | 2014-05-21 16:35:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-21 16:35:27 +0000 |
| commit | 4ee35806090a5e01600c87ff12ecd041ad4586f8 (patch) | |
| tree | 3405211b88face21680e590630f90e0ecd8d6665 /core/java/android/app | |
| parent | bee9d71293ede690faefd2d36141aece893a9e71 (diff) | |
| parent | 73f843de4b65772c624ca8ebb8c976a279e37ce9 (diff) | |
| download | frameworks_base-4ee35806090a5e01600c87ff12ecd041ad4586f8.zip frameworks_base-4ee35806090a5e01600c87ff12ecd041ad4586f8.tar.gz frameworks_base-4ee35806090a5e01600c87ff12ecd041ad4586f8.tar.bz2 | |
Merge "Change method name per API council request"
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/Activity.java | 4 | ||||
| -rw-r--r-- | core/java/android/app/ActivityTransitionCoordinator.java | 4 |
2 files changed, 4 insertions, 4 deletions
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 |