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 <LinearLayout | 7 <LinearLayout |
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 | 11 |
12 <org.chromium.chrome.browser.compositor.CompositorViewHolder | 12 <org.chromium.chrome.browser.compositor.CompositorViewHolder |
13 android:id="@+id/compositor_view_holder" | 13 android:id="@+id/compositor_view_holder" |
14 android:layout_width="match_parent" | 14 android:layout_width="match_parent" |
15 android:layout_height="0dp" | 15 android:layout_height="0dp" |
16 android:layout_weight="1" /> | 16 android:layout_weight="1" /> |
17 | 17 |
18 <FrameLayout | 18 <HorizontalScrollView |
19 android:id="@+id/keyboard_accessory" | 19 android:id="@+id/keyboard_accessory" |
| 20 android:layout_height="@dimen/keyboard_accessory_height" |
20 android:layout_width="match_parent" | 21 android:layout_width="match_parent" |
21 android:layout_height="wrap_content" | 22 android:background="#FFF" |
| 23 android:scrollbars="none" |
22 android:visibility="gone" /> | 24 android:visibility="gone" /> |
23 </LinearLayout> | 25 </LinearLayout> |
24 | 26 |
25 <ViewStub | 27 <ViewStub |
26 android:id="@+id/omnibox_results_container_stub" | 28 android:id="@+id/omnibox_results_container_stub" |
27 android:layout_width="match_parent" | 29 android:layout_width="match_parent" |
28 android:layout_height="match_parent" | 30 android:layout_height="match_parent" |
29 android:layout_marginTop="@dimen/tab_strip_height" | 31 android:layout_marginTop="@dimen/tab_strip_height" |
30 android:inflatedId="@+id/omnibox_results_container" | 32 android:inflatedId="@+id/omnibox_results_container" |
31 android:layout="@layout/omnibox_results_container" /> | 33 android:layout="@layout/omnibox_results_container" /> |
(...skipping 17 matching lines...) Expand all Loading... |
49 android:layout_height="match_parent" | 51 android:layout_height="match_parent" |
50 /> | 52 /> |
51 <!-- This empty view is used as the anchor for custom menu --> | 53 <!-- This empty view is used as the anchor for custom menu --> |
52 <View | 54 <View |
53 android:id="@+id/menu_anchor_stub" | 55 android:id="@+id/menu_anchor_stub" |
54 android:layout_width="0px" | 56 android:layout_width="0px" |
55 android:layout_height="0px" | 57 android:layout_height="0px" |
56 android:layout_gravity="bottom|start" | 58 android:layout_gravity="bottom|start" |
57 /> | 59 /> |
58 </merge> | 60 </merge> |
OLD | NEW |