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 <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/07/18 16:41:18
I'm pretty sure this needs to be match_parent. Th
jaebaek
2017/07/19 01:18:53
If we must keep it as match_parent, there is no ch
mdjones
2017/07/19 18:40:50
This will need to remain match parent. That being
jaebaek
2017/07/20 14:16:30
Simply checking whether a view's visibility is 'go
| |
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="match_parent" | 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" |
37 android:layout_width="match_parent" | 37 android:layout_width="match_parent" |
38 android:layout_gravity="start|bottom" | 38 android:layout_gravity="start|bottom" |
39 android:background="@drawable/keyboard_accessory_background" | 39 android:background="@drawable/keyboard_accessory_background" |
40 android:contentDescription="@string/autofill_keyboard_access ory_content_description" | 40 android:contentDescription="@string/autofill_keyboard_access ory_content_description" |
41 android:fillViewport="true" | 41 android:fillViewport="true" |
42 android:scrollbars="none" | 42 android:scrollbars="none" |
43 android:visibility="gone" /> | 43 android:visibility="gone" /> |
44 | 44 |
45 </org.chromium.chrome.browser.snackbar.BottomContainer> | 45 </org.chromium.chrome.browser.snackbar.BottomContainer> |
46 | 46 |
47 <ViewStub | 47 <ViewStub |
48 android:id="@+id/bottombar_stub" | 48 android:id="@+id/bottombar_stub" |
49 android:layout_width="match_parent" | 49 android:layout_width="match_parent" |
50 android:layout_height="wrap_content" | 50 android:layout_height="wrap_content" |
51 android:layout_marginTop="-4dp" | 51 android:layout_marginTop="-4dp" |
52 android:layout_gravity="start|bottom" | 52 android:layout_gravity="start|bottom" |
53 android:inflatedId="@+id/bottombar" | 53 android:inflatedId="@+id/bottombar" |
54 android:layout="@layout/custom_tabs_bottombar" /> | 54 android:layout="@layout/custom_tabs_bottombar" /> |
55 | 55 |
56 <org.chromium.chrome.browser.widget.FadingBackgroundView | 56 <org.chromium.chrome.browser.widget.FadingBackgroundView |
57 android:id="@+id/fading_focus_target" | 57 android:id="@+id/fading_focus_target" |
58 android:layout_width="match_parent" | 58 android:layout_width="match_parent" |
59 android:layout_height="match_parent" | 59 android:layout_height="0dp" |
Ted C
2017/07/18 16:41:18
as mentioned in the other file, this doesn't seem
jaebaek
2017/07/19 01:18:53
The reason behind this is because onResolvePointer
mdjones
2017/07/19 18:40:50
Does this view not return null for onResolvePointe
| |
60 android:layout_marginTop="@dimen/tab_strip_height" | 60 android:layout_marginTop="@dimen/tab_strip_height" |
61 android:background="@color/omnibox_focused_fading_background_col or" | 61 android:background="@color/omnibox_focused_fading_background_col or" |
62 android:visibility="gone" /> | 62 android:visibility="gone" /> |
63 | 63 |
64 <ViewStub | 64 <ViewStub |
65 android:id="@+id/omnibox_results_container_stub" | 65 android:id="@+id/omnibox_results_container_stub" |
66 android:layout_width="match_parent" | 66 android:layout_width="match_parent" |
67 android:layout_height="wrap_content" | 67 android:layout_height="wrap_content" |
68 android:inflatedId="@+id/omnibox_results_container" | 68 android:inflatedId="@+id/omnibox_results_container" |
69 android:layout="@layout/omnibox_results_container" /> | 69 android:layout="@layout/omnibox_results_container" /> |
(...skipping 15 matching lines...) Expand all 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 | |
106 </android.support.design.widget.CoordinatorLayout> | 105 </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 |