summaryrefslogtreecommitdiffstats
path: root/test-runner
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-03-14 10:38:05 -0700
committerDianne Hackborn <hackbod@google.com>2012-03-14 12:57:14 -0700
commita4972e951bf2bdb7afdafee95b3ab0c15b8bacae (patch)
tree9800a9dcd62d945a8ad71549ebcef70393ef5442 /test-runner
parent89ea4ca9c26f3c7e365525a0b83500e85517a457 (diff)
downloadframeworks_base-a4972e951bf2bdb7afdafee95b3ab0c15b8bacae.zip
frameworks_base-a4972e951bf2bdb7afdafee95b3ab0c15b8bacae.tar.gz
frameworks_base-a4972e951bf2bdb7afdafee95b3ab0c15b8bacae.tar.bz2
Add new "options" argument to all startActivity APIs.
This will be used to allow new features to be requested... such as, say, a special kind of animation. Right now there are no options defined. Change-Id: I4eb6f27275cdd4bf186f6da316ab93a2372ad4b7
Diffstat (limited to 'test-runner')
-rw-r--r--test-runner/src/android/test/mock/MockContext.java17
1 files changed, 17 insertions, 0 deletions
diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-runner/src/android/test/mock/MockContext.java
index 5fab2bb..bf583e1 100644
--- a/test-runner/src/android/test/mock/MockContext.java
+++ b/test-runner/src/android/test/mock/MockContext.java
@@ -251,16 +251,33 @@ public class MockContext extends Context {
}
@Override
+ public void startActivity(Intent intent, Bundle options) {
+ startActivity(intent);
+ }
+
+ @Override
public void startActivities(Intent[] intents) {
throw new UnsupportedOperationException();
}
@Override
+ public void startActivities(Intent[] intents, Bundle options) {
+ startActivities(intents);
+ }
+
+ @Override
public void startIntentSender(IntentSender intent,
Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags)
throws IntentSender.SendIntentException {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public void startIntentSender(IntentSender intent,
+ Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags,
+ Bundle options) throws IntentSender.SendIntentException {
+ startIntentSender(intent, fillInIntent, flagsMask, flagsValues, extraFlags);
+ }
@Override
public void sendBroadcast(Intent intent) {