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 <org.chromium.blimp.BlimpView | 7 <LinearLayout |
8 android:id="@+id/renderer" | |
9 android:layout_width="match_parent" | 8 android:layout_width="match_parent" |
10 android:layout_height="match_parent" /> | 9 android:layout_height="match_parent" |
| 10 android:orientation="vertical"> |
| 11 <!-- Toolbar --> |
| 12 <org.chromium.blimp.toolbar.Toolbar |
| 13 android:id="@+id/toolbar" |
| 14 android:layout_width="match_parent" |
| 15 android:layout_height="56dp" |
| 16 android:paddingStart="5dp" |
| 17 android:orientation="horizontal" |
| 18 android:gravity="center" |
| 19 android:background="#f2f2f2"> |
| 20 <org.chromium.blimp.toolbar.UrlBar |
| 21 android:id="@+id/toolbar_url_bar" |
| 22 android:layout_width="0dp" |
| 23 android:layout_height="48dp" |
| 24 android:layout_weight="1" |
| 25 android:paddingStart="10dp" |
| 26 android:paddingEnd="10dp" |
| 27 android:singleLine="true" |
| 28 android:maxLines="1" |
| 29 android:background="@drawable/textbox" |
| 30 android:textColor="#333" /> |
| 31 <ImageButton |
| 32 android:id="@+id/toolbar_reload_btn" |
| 33 android:layout_width="48dp" |
| 34 android:layout_height="56dp" |
| 35 android:background="?android:attr/selectableItemBackground" |
| 36 android:scaleType="center" |
| 37 android:src="@drawable/btn_reload" /> |
| 38 </org.chromium.blimp.toolbar.Toolbar> |
| 39 |
| 40 <!-- Content Area --> |
| 41 <org.chromium.blimp.BlimpView |
| 42 android:id="@+id/renderer" |
| 43 android:layout_width="match_parent" |
| 44 android:layout_height="match_parent" /> |
| 45 </LinearLayout> |
11 </merge> | 46 </merge> |
OLD | NEW |