Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2526)

Unified Diff: content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

Issue 888793002: Make content_browsertests for Chrome on Android running with valid Views (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove applying page scale factor Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
diff --git a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
index 9164413ba737d858c0f4b249c65b23c178a9c889..bc95f1cbe83fe9223dfe025aee6b8e8747b7d581 100644
--- a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
+++ b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
@@ -7,9 +7,10 @@ package org.chromium.content_browsertests_apk;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
+import android.os.Handler;
import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
import org.chromium.base.JNINamespace;
import org.chromium.base.annotations.SuppressFBWarnings;
@@ -45,17 +46,25 @@ public class ContentBrowserTestsActivity extends Activity {
BrowserStartupController.get(getApplicationContext(), LibraryProcessType.PROCESS_BROWSER)
.initChromiumBrowserProcessForTests();
- LayoutInflater inflater =
- (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- View view = inflater.inflate(R.layout.test_activity, null);
- mShellManager = (ShellManager) view.findViewById(R.id.shell_container);
+ setContentView(R.layout.test_activity);
+ mShellManager = (ShellManager) findViewById(R.id.shell_container);
mWindowAndroid = new ActivityWindowAndroid(this);
- mShellManager.setWindow(mWindowAndroid);
+ mShellManager.setWindow(mWindowAndroid, false);
- Log.i(TAG, "Running tests");
- runTests();
- Log.i(TAG, "Tests finished.");
- finish();
+ Window wind = this.getWindow();
+ wind.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+ wind.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+ wind.addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+
+ new Handler().post(new Runnable() {
+ @Override
+ public void run() {
+ Log.i(TAG, "Running tests");
+ runTests();
+ Log.i(TAG, "Tests finished.");
+ finish();
+ }
+ });
}
private void runTests() {

Powered by Google App Engine
This is Rietveld 408576698