android_webview/shell_apk/res/layout/testshell_activity.xml - Issue 12317015: [android_webview] Add test shell for webview.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/shell_apk/res/layout/testshell_activity.xml

Issue 12317015: [android_webview] Add test shell for webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 9 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

« no previous file with comments | « android_webview/shell_apk/AndroidManifest.xml ('k') | android_webview/shell_apk/src/org/chromium/android_webview/shell/AndroidWebViewTestShellActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/shell_apk/res/layout/testshell_activity.xml

diff --git a/content/shell/android/java/res/layout/shell_view.xml b/android_webview/shell_apk/res/layout/testshell_activity.xml

similarity index 75%

copy from content/shell/android/java/res/layout/shell_view.xml

copy to android_webview/shell_apk/res/layout/testshell_activity.xml

index d6c15d6f91f855af81c6a6550043c5fae7e1226a..0a997fa14d5d2902d83da4040a8d278394abeffc 100644

--- a/content/shell/android/java/res/layout/shell_view.xml

+++ b/android_webview/shell_apk/res/layout/testshell_activity.xml

@@ -1,22 +1,20 @@

<?xml version="1.0" encoding="utf-8"?>

Use of this source code is governed by a BSD-style license that can be

found in the LICENSE file.

-->

-<org.chromium.content_shell.Shell

+<LinearLayout android:id="@+id/testshell_activity"

xmlns:android="http://schemas.android.com/apk/res/android"

- android:id="@+id/container"

android:layout_width="match_parent"

android:layout_height="match_parent"

- android:orientation="vertical" >

+ android:orientation="vertical">

<LinearLayout android:id="@+id/toolbar"

android:layout_width="match_parent"

android:layout_height="wrap_content"

- android:orientation="horizontal"

- android:background="@drawable/progress">

+ android:orientation="horizontal">

<EditText android:id="@+id/url"

android:layout_width="0dp"

android:layout_height="wrap_content"

@@ -27,7 +25,6 @@

android:capitalize="sentences"

android:singleLine="true"

android:selectAllOnFocus="true"

- android:hint="@string/url_hint"

android:inputType="textUri"

android:imeOptions="actionGo" />

<ImageButton android:id="@+id/prev"

@@ -41,8 +38,10 @@

android:src="@android:drawable/ic_media_next"

android:scaleType="center" />

</LinearLayout>

- <FrameLayout android:id="@+id/contentview_holder"

+ <LinearLayout android:id="@+id/content_container"

android:layout_width="match_parent"

- android:layout_height="0dp"

- android:layout_weight="1" />

-</org.chromium.content_shell.Shell>

+ android:layout_height="match_parent">

+ </LinearLayout>

+</LinearLayout>