diff options
author | shenghuazhang <shenghuazhang@google.com> | 2016-03-08 11:17:48 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-08 19:19:14 +0000 |
commit | c0f91322048f287c102113e2d4ea24638c45bc04 (patch) | |
tree | c3cd142601ee18dc994c7f5215ef2238c55e3031 /base | |
parent | 6d2a6c6f57519254c20ed0003ef6ce349fa8b872 (diff) | |
download | chromium_src-c0f91322048f287c102113e2d4ea24638c45bc04.zip chromium_src-c0f91322048f287c102113e2d4ea24638c45bc04.tar.gz chromium_src-c0f91322048f287c102113e2d4ea24638c45bc04.tar.bz2 |
Remove starting animation in BaseInstrumentationTestRunner.java
Added TargetContext.java: Extending Context.java, TargetContext.java overrided startActivity
method executing with activityOptions to disable launching Animation.
Modified BaseInstrumentationTestRunner.java: changing startActivitySync(intent) by overriding getTargetContext
method and convert Context to TargetContext.
BUG=528037
Review URL: https://codereview.chromium.org/1772763003
Cr-Commit-Position: refs/heads/master@{#379881}
Diffstat (limited to 'base')
-rw-r--r-- | base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java b/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java index 24a7e3a..fd6fafd 100644 --- a/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java +++ b/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java @@ -4,7 +4,10 @@ package org.chromium.base.test; +import android.app.ActivityOptions; import android.content.Context; +import android.content.ContextWrapper; +import android.content.Intent; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Build; @@ -154,4 +157,17 @@ public class BaseInstrumentationTestRunner extends InstrumentationTestRunner { return false; } } + + @Override + public Context getTargetContext() { + return new ContextWrapper(super.getTargetContext()) { + @Override + public void startActivity(Intent intent) { + Context context = getApplicationContext(); + ActivityOptions activityOptions = + ActivityOptions.makeCustomAnimation(context, 0, 0); + startActivity(intent, activityOptions.toBundle()); + } + }; + } } |