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

Commit 345d4f4f authored Sep 09, 2014 by Craig Mautner Committed by Android (Google) Code Review Sep 09, 2014

Merge "Remove deprecated (and now unused) API method." into lmp-dev

parents bb8c4834 0321573f

api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -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>...);

core/java/android/app/ActivityOptions.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -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;

tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);