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 <android.support.design.widget.CoordinatorLayout | 12 <android.support.design.widget.CoordinatorLayout |
13 android:id="@+id/coordinator" | 13 android:id="@+id/coordinator" |
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 <org.chromium.chrome.browser.compositor.CompositorViewHolder | 18 <org.chromium.chrome.browser.compositor.CompositorViewHolder |
19 android:id="@+id/compositor_view_holder" | 19 android:id="@+id/compositor_view_holder" |
20 android:layout_width="match_parent" | 20 android:layout_width="match_parent" |
21 android:layout_height="match_parent" /> | 21 android:layout_height="match_parent" /> |
22 | 22 |
| 23 <View |
| 24 android:id="@+id/fading_focus_target" |
| 25 android:layout_width="match_parent" |
| 26 android:layout_height="match_parent" |
| 27 android:layout_marginTop="@dimen/tab_strip_height" |
| 28 android:background="@color/omnibox_focused_fading_background_col
or" |
| 29 android:visibility="gone" /> |
| 30 |
23 <ViewStub | 31 <ViewStub |
24 android:id="@+id/omnibox_results_container_stub" | 32 android:id="@+id/omnibox_results_container_stub" |
25 android:layout_width="match_parent" | 33 android:layout_width="match_parent" |
26 android:layout_height="match_parent" | 34 android:layout_height="wrap_content" |
27 android:layout_marginTop="@dimen/tab_strip_height" | |
28 android:inflatedId="@+id/omnibox_results_container" | 35 android:inflatedId="@+id/omnibox_results_container" |
29 android:layout="@layout/omnibox_results_container" /> | 36 android:layout="@layout/omnibox_results_container" /> |
30 | 37 |
31 <org.chromium.chrome.browser.snackbar.BottomContainer | 38 <org.chromium.chrome.browser.snackbar.BottomContainer |
32 android:id="@+id/bottom_container" | 39 android:id="@+id/bottom_container" |
33 android:layout_width="match_parent" | 40 android:layout_width="match_parent" |
34 android:layout_height="match_parent" | 41 android:layout_height="match_parent" |
35 android:layout_gravity="start|bottom" /> | 42 android:layout_gravity="start|bottom" /> |
36 | 43 |
37 <ViewStub | 44 <ViewStub |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 </LinearLayout> | 84 </LinearLayout> |
78 | 85 |
79 <!-- This empty view is used as the anchor for custom menu --> | 86 <!-- This empty view is used as the anchor for custom menu --> |
80 <View | 87 <View |
81 android:id="@+id/menu_anchor_stub" | 88 android:id="@+id/menu_anchor_stub" |
82 android:layout_width="0px" | 89 android:layout_width="0px" |
83 android:layout_height="0px" | 90 android:layout_height="0px" |
84 android:layout_gravity="bottom|start" | 91 android:layout_gravity="bottom|start" |
85 /> | 92 /> |
86 </merge> | 93 </merge> |
OLD | NEW |