| OLD | NEW |
| (Empty) |
| 1 <?xml version="1.0" encoding="utf-8"?> | |
| 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 | |
| 4 found in the LICENSE file. --> | |
| 5 | |
| 6 <merge xmlns:android="http://schemas.android.com/apk/res/android"> | |
| 7 <RelativeLayout | |
| 8 android:id="@+id/container" | |
| 9 android:layout_width="match_parent" | |
| 10 android:layout_height="match_parent" | |
| 11 android:orientation="vertical"> | |
| 12 <!-- Toolbar --> | |
| 13 <org.chromium.blimp.app.toolbar.Toolbar | |
| 14 android:id="@+id/toolbar" | |
| 15 android:layout_width="match_parent" | |
| 16 android:layout_height="56dp" | |
| 17 android:layout_alignParentTop="true" | |
| 18 android:layout_alignParentStart="true" | |
| 19 android:layout_alignParentEnd="true" | |
| 20 android:paddingStart="5dp" | |
| 21 android:orientation="horizontal" | |
| 22 android:gravity="center" | |
| 23 android:background="#f2f2f2"> | |
| 24 <org.chromium.blimp.app.toolbar.UrlBar | |
| 25 android:id="@+id/toolbar_url_bar" | |
| 26 android:layout_width="0dp" | |
| 27 android:layout_height="48dp" | |
| 28 android:layout_weight="1" | |
| 29 android:paddingStart="10dp" | |
| 30 android:paddingEnd="10dp" | |
| 31 android:singleLine="true" | |
| 32 android:maxLines="1" | |
| 33 android:selectAllOnFocus="true" | |
| 34 android:inputType="textUri" | |
| 35 android:background="@drawable/textbox" | |
| 36 android:textColor="#333" /> | |
| 37 <ProgressBar | |
| 38 android:id="@+id/page_load_progress" | |
| 39 android:visibility="invisible" | |
| 40 android:layout_marginStart="10dp" | |
| 41 android:layout_width="wrap_content" | |
| 42 android:layout_height="wrap_content" | |
| 43 style="@android:style/Widget.ProgressBar.Small" /> | |
| 44 <ImageButton | |
| 45 android:id="@+id/toolbar_reload_btn" | |
| 46 android:layout_width="48dp" | |
| 47 android:layout_height="56dp" | |
| 48 android:background="?android:attr/selectableItemBackground" | |
| 49 android:scaleType="center" | |
| 50 android:src="@drawable/btn_reload" /> | |
| 51 <ImageButton | |
| 52 android:id="@+id/menu_button" | |
| 53 android:layout_width="wrap_content" | |
| 54 android:layout_height="48dp" | |
| 55 android:paddingEnd="4dp" | |
| 56 android:layout_gravity="center" | |
| 57 android:background="@null" | |
| 58 android:src="@drawable/btn_menu" /> | |
| 59 </org.chromium.blimp.app.toolbar.Toolbar> | |
| 60 | |
| 61 <!-- Content Area --> | |
| 62 <org.chromium.blimp.app.BlimpContentsDisplay | |
| 63 android:id="@+id/contents_display" | |
| 64 android:layout_width="match_parent" | |
| 65 android:layout_height="match_parent" | |
| 66 android:layout_alignParentStart="true" | |
| 67 android:layout_alignParentEnd="true" | |
| 68 android:layout_alignParentBottom="true" | |
| 69 android:layout_below="@id/toolbar" /> | |
| 70 </RelativeLayout> | |
| 71 </merge> | |
| OLD | NEW |