Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '77e1dc741bfce75f3e3f5446674d1545a74eae2b':
  Remove deprecated (and now unused) API method.
This commit is contained in:
Craig Mautner
2014-09-09 17:11:05 +00:00
committed by Android Git Automerger
parent 3046cbd8ef 345d4f4f14
commit 4e59ecf211
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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>...);

5
core/java/android/app/ActivityOptions.java
View File

@@ -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;

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

@@ -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);