diff options
| author | Craig Mautner <cmautner@google.com> | 2014-09-09 08:53:56 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2014-09-09 08:53:56 -0700 |
| commit | 0321573fa7583cd2ac4ece015c2eb784e3b24eb8 (patch) | |
| tree | b623a531de65b0eb2cae0cd778fcfa654829a1a9 | |
| parent | 68c936f77d836285c255e98b73bdadb78025ade9 (diff) | |
Remove deprecated (and now unused) API method.
Removes ActivityOptions.makeLaunchTaskBehindAnimation().
Fixes bug 16958544.
Change-Id: I2d58f4235994fe01d55b3309d0ec6f8449c5d5b8
| -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 993ada19c47a..d67319062182 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3791,7 +3791,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 9dd46056c3e3..302f7328a565 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -515,11 +515,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 e03b9c824791..91cfd77dca05 100644 --- a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java +++ b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java @@ -74,7 +74,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); |