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 <org.chromium.chrome.browser.coordinator.CoordinatorLayoutForPointer |
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 <FrameLayout | 23 <FrameLayout |
24 android:id="@+id/overview_list_layout_holder" | 24 android:id="@+id/overview_list_layout_holder" |
25 android:layout_width="match_parent" | 25 android:layout_width="match_parent" |
26 android:layout_height="match_parent" /> | 26 android:layout_height="wrap_content" /> |
Ted C
2017/08/09 04:30:54
With your fixes for pointers in the outer containe
jaebaek
2017/08/09 06:38:17
Marking it gone causes several test failures such
Ted C
2017/08/09 16:30:55
I think we should fix the code to make this work t
jaebaek
2017/08/11 00:47:35
Done.
| |
27 | 27 |
28 <org.chromium.chrome.browser.snackbar.BottomContainer | 28 <org.chromium.chrome.browser.snackbar.BottomContainer |
29 android:id="@+id/bottom_container" | 29 android:id="@+id/bottom_container" |
30 android:layout_width="match_parent" | 30 android:layout_width="match_parent" |
31 android:layout_height="wrap_content" | 31 android:layout_height="wrap_content" |
32 android:layout_gravity="start|bottom"> | 32 android:layout_gravity="start|bottom"> |
33 | 33 |
34 <HorizontalScrollView | 34 <HorizontalScrollView |
35 android:id="@+id/keyboard_accessory" | 35 android:id="@+id/keyboard_accessory" |
36 android:layout_height="@dimen/keyboard_accessory_height" | 36 android:layout_height="@dimen/keyboard_accessory_height" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
85 android:id="@+id/bottom_nav_stub" | 85 android:id="@+id/bottom_nav_stub" |
86 android:layout_width="match_parent" | 86 android:layout_width="match_parent" |
87 android:layout_height="@dimen/bottom_nav_height" | 87 android:layout_height="@dimen/bottom_nav_height" |
88 android:layout_gravity="start|bottom" | 88 android:layout_gravity="start|bottom" |
89 android:inflatedId="@+id/bottom_nav" | 89 android:inflatedId="@+id/bottom_nav" |
90 android:layout="@layout/bottom_sheet_bottom_nav" /> | 90 android:layout="@layout/bottom_sheet_bottom_nav" /> |
91 | 91 |
92 <FrameLayout | 92 <FrameLayout |
93 android:id="@+id/bottom_sheet_snackbar_container" | 93 android:id="@+id/bottom_sheet_snackbar_container" |
94 android:layout_width="match_parent" | 94 android:layout_width="match_parent" |
95 android:layout_height="match_parent" | 95 android:layout_height="wrap_content" |
96 android:layout_gravity="start|bottom" | 96 android:layout_gravity="start|bottom" |
97 android:layout_marginTop="@dimen/bottom_nav_height_inverse" /> | 97 android:layout_marginTop="@dimen/bottom_nav_height_inverse" /> |
98 | 98 |
99 <ViewStub | 99 <ViewStub |
100 android:id="@+id/empty_container_stub" | 100 android:id="@+id/empty_container_stub" |
101 android:inflatedId="@+id/empty_container" | 101 android:inflatedId="@+id/empty_container" |
102 android:layout="@layout/empty_background_view_tablet" | 102 android:layout="@layout/empty_background_view_tablet" |
103 android:layout_width="match_parent" | 103 android:layout_width="match_parent" |
104 android:layout_height="match_parent" /> | 104 android:layout_height="match_parent" /> |
105 | 105 </org.chromium.chrome.browser.coordinator.CoordinatorLayoutForPointer> |
106 </android.support.design.widget.CoordinatorLayout> | |
107 | 106 |
108 </LinearLayout> | 107 </LinearLayout> |
109 | 108 |
110 <!-- This empty view is used as the anchor for custom menu --> | 109 <!-- This empty view is used as the anchor for custom menu --> |
111 <View | 110 <View |
112 android:id="@+id/menu_anchor_stub" | 111 android:id="@+id/menu_anchor_stub" |
113 android:layout_width="0px" | 112 android:layout_width="0px" |
114 android:layout_height="0px" | 113 android:layout_height="0px" |
115 android:layout_gravity="bottom|start" | 114 android:layout_gravity="bottom|start" |
116 /> | 115 /> |
117 </merge> | 116 </merge> |
OLD | NEW |