OLD | NEW |
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. |
3 Use of this source code is governed by a BSD-style license that can be | 3 Use of this source code is governed by a BSD-style license that can be |
4 found in the LICENSE file. --> | 4 found in the LICENSE file. --> |
5 | 5 |
6 <merge xmlns:android="http://schemas.android.com/apk/res/android"> | 6 <merge xmlns:android="http://schemas.android.com/apk/res/android"> |
7 <RelativeLayout | 7 <RelativeLayout |
8 android:layout_width="match_parent" | 8 android:layout_width="match_parent" |
9 android:layout_height="match_parent" | 9 android:layout_height="match_parent" |
10 android:orientation="vertical"> | 10 android:orientation="vertical"> |
11 <!-- Toolbar --> | 11 <!-- Toolbar --> |
12 <org.chromium.blimp.toolbar.Toolbar | 12 <org.chromium.blimp.app.toolbar.Toolbar |
13 android:id="@+id/toolbar" | 13 android:id="@+id/toolbar" |
14 android:layout_width="match_parent" | 14 android:layout_width="match_parent" |
15 android:layout_height="56dp" | 15 android:layout_height="56dp" |
16 android:layout_alignParentTop="true" | 16 android:layout_alignParentTop="true" |
17 android:paddingStart="5dp" | 17 android:paddingStart="5dp" |
18 android:orientation="horizontal" | 18 android:orientation="horizontal" |
19 android:gravity="center" | 19 android:gravity="center" |
20 android:background="#f2f2f2"> | 20 android:background="#f2f2f2"> |
21 <org.chromium.blimp.toolbar.UrlBar | 21 <org.chromium.blimp.app.toolbar.UrlBar |
22 android:id="@+id/toolbar_url_bar" | 22 android:id="@+id/toolbar_url_bar" |
23 android:layout_width="0dp" | 23 android:layout_width="0dp" |
24 android:layout_height="48dp" | 24 android:layout_height="48dp" |
25 android:layout_weight="1" | 25 android:layout_weight="1" |
26 android:paddingStart="10dp" | 26 android:paddingStart="10dp" |
27 android:paddingEnd="10dp" | 27 android:paddingEnd="10dp" |
28 android:singleLine="true" | 28 android:singleLine="true" |
29 android:maxLines="1" | 29 android:maxLines="1" |
30 android:selectAllOnFocus="true" | 30 android:selectAllOnFocus="true" |
31 android:inputType="textUri" | 31 android:inputType="textUri" |
(...skipping 14 matching lines...) Expand all Loading... |
46 android:scaleType="center" | 46 android:scaleType="center" |
47 android:src="@drawable/btn_reload" /> | 47 android:src="@drawable/btn_reload" /> |
48 <ImageButton | 48 <ImageButton |
49 android:id="@+id/menu_button" | 49 android:id="@+id/menu_button" |
50 android:layout_width="wrap_content" | 50 android:layout_width="wrap_content" |
51 android:layout_height="48dp" | 51 android:layout_height="48dp" |
52 android:paddingEnd="4dp" | 52 android:paddingEnd="4dp" |
53 android:layout_gravity="center" | 53 android:layout_gravity="center" |
54 android:background="@null" | 54 android:background="@null" |
55 android:src="@drawable/btn_menu" /> | 55 android:src="@drawable/btn_menu" /> |
56 </org.chromium.blimp.toolbar.Toolbar> | 56 </org.chromium.blimp.app.toolbar.Toolbar> |
57 | 57 |
58 <!-- Content Area --> | 58 <!-- Content Area --> |
59 <org.chromium.blimp.BlimpView | 59 <org.chromium.blimp.app.BlimpContentsDisplay |
60 android:id="@+id/renderer" | 60 android:id="@+id/renderer" |
61 android:layout_width="match_parent" | 61 android:layout_width="match_parent" |
62 android:layout_height="match_parent" | 62 android:layout_height="match_parent" |
63 android:layout_below="@+id/toolbar"/> | 63 android:layout_below="@+id/toolbar"/> |
64 | 64 |
65 <include android:id="@+id/debug_stats" | 65 <include android:id="@+id/debug_stats" |
66 layout="@layout/debug_stats_overlay" | 66 layout="@layout/debug_stats_overlay" |
67 android:layout_width="wrap_content" | 67 android:layout_width="wrap_content" |
68 android:layout_height="wrap_content" | 68 android:layout_height="wrap_content" |
69 android:layout_alignParentBottom="true" | 69 android:layout_alignParentBottom="true" |
70 android:visibility="invisible" /> | 70 android:visibility="invisible" /> |
71 | 71 |
72 </RelativeLayout> | 72 </RelativeLayout> |
73 </merge> | 73 </merge> |
OLD | NEW |