summaryrefslogtreecommitdiffstats
path: root/tests/ActivityTests
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-09-09 17:05:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-09 17:05:04 +0000
commit345d4f4f14038c2225cd599f9c432b25e572dc2c (patch)
treee116de958f5269166bac765250fbacb2239be860 /tests/ActivityTests
parentbb8c4834613207cf880e8491b33eb495cc268548 (diff)
parent0321573fa7583cd2ac4ece015c2eb784e3b24eb8 (diff)
downloadframeworks_base-345d4f4f14038c2225cd599f9c432b25e572dc2c.zip
frameworks_base-345d4f4f14038c2225cd599f9c432b25e572dc2c.tar.gz
frameworks_base-345d4f4f14038c2225cd599f9c432b25e572dc2c.tar.bz2
Merge "Remove deprecated (and now unused) API method." into lmp-dev
Diffstat (limited to 'tests/ActivityTests')
-rw-r--r--tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java2
1 files changed, 1 insertions, 1 deletions
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 44787e7..6837d22 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);