| 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.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.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" |
| 31 android:inputType="textUri" |
| 30 android:background="@drawable/textbox" | 32 android:background="@drawable/textbox" |
| 31 android:textColor="#333" /> | 33 android:textColor="#333" /> |
| 32 <ProgressBar | 34 <ProgressBar |
| 33 android:id="@+id/page_load_progress" | 35 android:id="@+id/page_load_progress" |
| 34 android:visibility="invisible" | 36 android:visibility="invisible" |
| 35 android:layout_marginStart="10dp" | 37 android:layout_marginStart="10dp" |
| 36 android:layout_width="wrap_content" | 38 android:layout_width="wrap_content" |
| 37 android:layout_height="wrap_content" | 39 android:layout_height="wrap_content" |
| 38 style="@android:style/Widget.ProgressBar.Small" /> | 40 style="@android:style/Widget.ProgressBar.Small" /> |
| 39 <ImageButton | 41 <ImageButton |
| (...skipping 18 matching lines...) Expand all Loading... |
| 58 android:background="@drawable/web_input_background" | 60 android:background="@drawable/web_input_background" |
| 59 android:layout_alignParentBottom="true" | 61 android:layout_alignParentBottom="true" |
| 60 android:layout_marginTop="45dp" | 62 android:layout_marginTop="45dp" |
| 61 android:padding="10dp" | 63 android:padding="10dp" |
| 62 android:paddingTop="16dp" | 64 android:paddingTop="16dp" |
| 63 android:inputType="text|textWebEditText" | 65 android:inputType="text|textWebEditText" |
| 64 android:visibility="gone"/> | 66 android:visibility="gone"/> |
| 65 | 67 |
| 66 </RelativeLayout> | 68 </RelativeLayout> |
| 67 </merge> | 69 </merge> |
| OLD | NEW |