chrome/android/testshell/res/layout/testshell_activity.xml - Issue 10968003: Add rendering support to the TestShell.

Side by Side Diff: chrome/android/testshell/res/layout/testshell_activity.xml

Issue 10968003: Add rendering support to the TestShell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed nits, rebased. Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellToolbar.java ('k') | chrome/android/testshell/res/values/dimens.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

2	2

3 <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved.	3 <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved.

4	4

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

6 found in the LICENSE file.	6 found in the LICENSE file.

7 -->	7 -->

8	8

9 <org.chromium.content_shell.Shell	9 <org.chromium.chrome.testshell.TabManager android:id="@+id/tab_manager"

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

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

12 android:layout_width="match_parent"	11 android:layout_width="match_parent"

13 android:layout_height="match_parent"	12 android:layout_height="match_parent"

14 android:orientation="vertical" >	13 android:orientation="vertical">

15 <LinearLayout android:id="@+id/toolbar"	14 <org.chromium.chrome.testshell.TestShellToolbar android:id="@+id/toolbar"

16 android:layout_width="match_parent"	15 android:layout_width="match_parent"

17 android:layout_height="wrap_content"	16 android:layout_height="wrap_content"

18 android:orientation="horizontal"	17 android:orientation="horizontal"

19 android:background="@drawable/progress">	18 android:background="@drawable/progress">

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

21 android:layout_width="0dp"	20 android:layout_width="0dp"

22 android:layout_height="wrap_content"	21 android:layout_height="wrap_content"

23 android:layout_weight="1"	22 android:layout_weight="1"

24 android:gravity="bottom"	23 android:gravity="bottom"

25 android:textSize="18sp"	24 android:textSize="18sp"

26 android:autoText="true"	25 android:autoText="true"

27 android:capitalize="sentences"	26 android:capitalize="sentences"

28 android:singleLine="true"	27 android:singleLine="true"

29 android:selectAllOnFocus="true"	28 android:selectAllOnFocus="true"

30 android:hint="@string/url_hint"	29 android:hint="@string/url_hint"

31 android:inputType="textUri"	30 android:inputType="textUri"

32 android:imeOptions="actionGo" />	31 android:imeOptions="actionGo" />

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

34 android:layout_width="38dp"	33 android:layout_width="38dp"

35 android:layout_height="38dp"	34 android:layout_height="38dp"

36 android:src="@android:drawable/ic_media_previous"	35 android:src="@android:drawable/ic_media_previous"

37 android:scaleType="center" />	36 android:scaleType="center" />

38 <ImageButton android:id="@+id/next"	37 <ImageButton android:id="@+id/next"

39 android:layout_width="38dp"	38 android:layout_width="38dp"

40 android:layout_height="38dp"	39 android:layout_height="38dp"

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

42 android:scaleType="center" />	41 android:scaleType="center" />

43 </LinearLayout>	42 </org.chromium.chrome.testshell.TestShellToolbar>

44 <FrameLayout android:id="@+id/contentview_holder"	43 <FrameLayout android:id="@+id/content_container"

45 android:layout_width="match_parent"	44 android:layout_width="match_parent"

46 android:layout_height="0dp"	45 android:layout_height="0dp"

47 android:layout_weight="1" />	46 android:layout_weight="1">

48 </org.chromium.content_shell.Shell>	47 <SurfaceView android:id="@+id/render_target"

	48 android:layout_width="match_parent"

	49 android:layout_height="match_parent" />

	50 </FrameLayout>

	51

	52 </org.chromium.chrome.testshell.TabManager>

OLD	NEW