diff options
| author | Craig Mautner <cmautner@google.com> | 2014-09-09 17:05:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-09 17:05:04 +0000 |
| commit | 345d4f4f14038c2225cd599f9c432b25e572dc2c (patch) | |
| tree | e116de958f5269166bac765250fbacb2239be860 | |
| parent | bb8c4834613207cf880e8491b33eb495cc268548 (diff) | |
| parent | 0321573fa7583cd2ac4ece015c2eb784e3b24eb8 (diff) | |
Merge "Remove deprecated (and now unused) API method." into lmp-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/ActivityOptions.java | 5 | ||||
| -rw-r--r-- | tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/api/current.txt b/api/current.txt index cd4b7877442a..9b53c056e08a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3792,7 +3792,6 @@ package android.app { public class ActivityOptions { method public static android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int); - method public static deprecated android.app.ActivityOptions makeLaunchTaskBehindAnimation(); method public static android.app.ActivityOptions makeScaleUpAnimation(android.view.View, int, int, int, int); method public static android.app.ActivityOptions makeSceneTransitionAnimation(android.app.Activity, android.view.View, java.lang.String); method public static android.app.ActivityOptions makeSceneTransitionAnimation(android.app.Activity, android.util.Pair<android.view.View, java.lang.String>...); diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index ffffb6c1d914..213c7f6eff6d 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -520,11 +520,6 @@ public class ActivityOptions { return opts; } - @Deprecated - public static ActivityOptions makeLaunchTaskBehindAnimation() { - return makeTaskLaunchBehind(); - } - /** @hide */ public boolean getLaunchTaskBehind() { return mAnimationType == ANIM_LAUNCH_TASK_BEHIND; diff --git a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java index 44787e785ce7..6837d2236049 100644 --- a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java +++ b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java @@ -73,7 +73,7 @@ public class ActivityTestMain extends Activity { Intent intent = new Intent(ActivityTestMain.this, SpamActivity.class); Bundle options = null; if (fg) { - ActivityOptions opts = ActivityOptions.makeLaunchTaskBehindAnimation(); + ActivityOptions opts = ActivityOptions.makeTaskLaunchBehind(); options = opts.toBundle(); } startActivity(intent, options); |