| 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"> |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 android:maxLines="1" | 29 android:maxLines="1" |
| 30 android:background="@drawable/textbox" | 30 android:background="@drawable/textbox" |
| 31 android:textColor="#333" /> | 31 android:textColor="#333" /> |
| 32 <ImageButton | 32 <ImageButton |
| 33 android:id="@+id/toolbar_reload_btn" | 33 android:id="@+id/toolbar_reload_btn" |
| 34 android:layout_width="48dp" | 34 android:layout_width="48dp" |
| 35 android:layout_height="56dp" | 35 android:layout_height="56dp" |
| 36 android:background="?android:attr/selectableItemBackground" | 36 android:background="?android:attr/selectableItemBackground" |
| 37 android:scaleType="center" | 37 android:scaleType="center" |
| 38 android:src="@drawable/btn_reload" /> | 38 android:src="@drawable/btn_reload" /> |
| 39 <ImageButton |
| 40 android:id="@+id/menu_button" |
| 41 android:layout_width="wrap_content" |
| 42 android:layout_height="48dp" |
| 43 android:paddingEnd="4dp" |
| 44 android:layout_gravity="center" |
| 45 android:background="@null" |
| 46 android:src="@drawable/btn_menu" /> |
| 39 </org.chromium.blimp.toolbar.Toolbar> | 47 </org.chromium.blimp.toolbar.Toolbar> |
| 40 | 48 |
| 41 <!-- Content Area --> | 49 <!-- Content Area --> |
| 42 <org.chromium.blimp.BlimpView | 50 <org.chromium.blimp.BlimpView |
| 43 android:id="@+id/renderer" | 51 android:id="@+id/renderer" |
| 44 android:layout_width="match_parent" | 52 android:layout_width="match_parent" |
| 45 android:layout_height="match_parent" | 53 android:layout_height="match_parent" |
| 46 android:layout_below="@+id/toolbar"/> | 54 android:layout_below="@+id/toolbar"/> |
| 47 <org.chromium.blimp.input.WebInputBox | 55 <org.chromium.blimp.input.WebInputBox |
| 48 android:id="@+id/editText" | 56 android:id="@+id/editText" |
| 49 android:layout_width="match_parent" | 57 android:layout_width="match_parent" |
| 50 android:layout_height="wrap_content" | 58 android:layout_height="wrap_content" |
| 51 android:background="@drawable/web_input_background" | 59 android:background="@drawable/web_input_background" |
| 52 android:layout_alignParentBottom="true" | 60 android:layout_alignParentBottom="true" |
| 53 android:layout_marginTop="45dp" | 61 android:layout_marginTop="45dp" |
| 54 android:padding="10dp" | 62 android:padding="10dp" |
| 55 android:paddingTop="16dp" | 63 android:paddingTop="16dp" |
| 56 android:inputType="text|textWebEditText" | 64 android:inputType="text|textWebEditText" |
| 57 android:visibility="gone"/> | 65 android:visibility="gone"/> |
| 58 | 66 |
| 59 </RelativeLayout> | 67 </RelativeLayout> |
| 60 </merge> | 68 </merge> |
| OLD | NEW |