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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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.toolbar.Toolbar> |
57 | 57 |
58 <!-- Content Area --> | 58 <!-- Content Area --> |
59 <org.chromium.blimp.BlimpView | 59 <org.chromium.blimp.BlimpView |
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 |
| 65 <include android:id="@+id/debug_stats" |
| 66 layout="@layout/debug_stats_overlay" |
| 67 android:layout_width="wrap_content" |
| 68 android:layout_height="wrap_content" |
| 69 android:layout_alignParentBottom="true" |
| 70 android:visibility="invisible" /> |
| 71 |
64 <org.chromium.blimp.input.WebInputBox | 72 <org.chromium.blimp.input.WebInputBox |
65 android:id="@+id/editText" | 73 android:id="@+id/editText" |
66 android:layout_width="match_parent" | 74 android:layout_width="match_parent" |
67 android:layout_height="wrap_content" | 75 android:layout_height="wrap_content" |
68 android:background="@drawable/web_input_background" | 76 android:background="@drawable/web_input_background" |
69 android:layout_alignParentBottom="true" | 77 android:layout_alignParentBottom="true" |
70 android:layout_marginTop="45dp" | 78 android:layout_marginTop="45dp" |
71 android:padding="10dp" | 79 android:padding="10dp" |
72 android:paddingTop="16dp" | 80 android:paddingTop="16dp" |
73 android:inputType="text|textWebEditText" | 81 android:inputType="text|textWebEditText" |
74 android:visibility="gone"/> | 82 android:visibility="gone"/> |
75 | 83 |
76 </RelativeLayout> | 84 </RelativeLayout> |
77 </merge> | 85 </merge> |
OLD | NEW |