OLD | NEW |
---|---|
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 <!-- Copyright 2016 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2016 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 <org.chromium.chrome.browser.widget.BottomSheet | 6 <org.chromium.chrome.browser.widget.BottomSheet |
7 xmlns:android="http://schemas.android.com/apk/res/android" | 7 xmlns:android="http://schemas.android.com/apk/res/android" |
8 android:id="@+id/bottom_sheet" | 8 android:id="@+id/bottom_sheet" |
9 android:layout_width="match_parent" | 9 android:layout_width="match_parent" |
10 android:layout_height="wrap_content" > | 10 android:layout_height="wrap_content" > |
11 | 11 |
12 <org.chromium.chrome.browser.toolbar.ToolbarControlContainer | 12 <org.chromium.chrome.browser.toolbar.ToolbarControlContainer |
13 android:id="@+id/control_container" | 13 android:id="@+id/control_container" |
14 android:layout_width="match_parent" | 14 android:layout_width="match_parent" |
15 android:layout_height="wrap_content" | 15 android:layout_height="wrap_content" |
16 android:minHeight="@dimen/control_container_height" > | 16 android:minHeight="@dimen/bottom_control_container_height" > |
17 | |
17 <view | 18 <view |
18 class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$T oolbarViewResourceFrameLayout" | 19 class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$T oolbarViewResourceFrameLayout" |
19 android:id="@+id/toolbar_container" | 20 android:id="@+id/toolbar_container" |
20 android:layout_width="match_parent" | 21 android:layout_width="match_parent" |
21 android:layout_height="wrap_content"> | 22 android:layout_height="wrap_content" > |
22 <ImageView | 23 <ImageView |
23 android:id="@+id/bottom_toolbar_shadow" | 24 android:id="@+id/bottom_toolbar_shadow" |
24 android:layout_width="match_parent" | 25 android:layout_width="match_parent" |
25 android:layout_height="@dimen/toolbar_shadow_height" | 26 android:layout_height="@dimen/toolbar_shadow_height" |
26 android:src="@drawable/toolbar_shadow" | 27 android:src="@drawable/toolbar_shadow" |
27 android:scaleType="fitXY" | 28 android:scaleType="fitXY" |
28 android:scaleY="-1" | 29 android:scaleY="-1" |
29 android:contentDescription="@null" /> | 30 android:contentDescription="@null" /> |
30 <ViewStub | 31 <ViewStub |
31 android:id="@+id/toolbar_stub" | 32 android:id="@+id/toolbar_stub" |
32 android:layout_width="match_parent" | 33 android:layout_width="match_parent" |
33 android:layout_height="@dimen/toolbar_height_no_shadow" | 34 android:layout_height="@dimen/bottom_control_container_height" |
34 android:layout_marginTop="@dimen/toolbar_shadow_height" /> | 35 android:layout_marginTop="@dimen/toolbar_shadow_height" /> |
Theresa
2017/03/13 23:08:42
What happens if we adjust this margin rather than
mdjones
2017/03/13 23:43:39
All the contents try to adjust to the new height.
Theresa
2017/03/14 00:01:45
Okay -- so we may have to programatically adjust t
mdjones
2017/03/14 16:25:28
I can, but I would need to make two copies of what
| |
35 <ViewStub | 36 <ViewStub |
36 android:id="@+id/find_toolbar_stub" | 37 android:id="@+id/find_toolbar_stub" |
37 android:inflatedId="@+id/find_toolbar" | 38 android:inflatedId="@+id/find_toolbar" |
38 android:layout_marginTop="@dimen/toolbar_shadow_height" | 39 android:layout_marginTop="@dimen/toolbar_shadow_height" |
39 android:layout_width="match_parent" | 40 android:layout_width="match_parent" |
40 android:layout_height="@dimen/toolbar_height_no_shadow" | 41 android:layout_height="@dimen/bottom_control_container_height" |
41 android:layout="@layout/find_toolbar" | 42 android:layout="@layout/find_toolbar" /> |
42 android:visibility="gone" /> | 43 <ImageView |
44 android:id="@+id/toolbar_handle" | |
45 android:layout_width="@dimen/toolbar_handle_width" | |
46 android:layout_height="@dimen/toolbar_handle_height" | |
47 android:layout_marginTop="@dimen/toolbar_handle_margin_top" | |
48 android:layout_gravity="center|top" | |
49 android:contentDescription="@null" /> | |
43 </view> | 50 </view> |
44 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer> | 51 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer> |
45 | 52 |
46 <FrameLayout | 53 <FrameLayout |
47 android:id="@+id/bottom_sheet_content" | 54 android:id="@+id/bottom_sheet_content" |
48 android:layout_width="match_parent" | 55 android:layout_width="match_parent" |
49 android:layout_height="match_parent" /> | 56 android:layout_height="match_parent" /> |
50 | 57 |
51 <ViewStub | 58 <ViewStub |
52 android:id="@+id/bottom_omnibox_results_container_stub" | 59 android:id="@+id/bottom_omnibox_results_container_stub" |
53 android:layout_width="match_parent" | 60 android:layout_width="match_parent" |
54 android:layout_height="wrap_content" | 61 android:layout_height="wrap_content" |
55 android:inflatedId="@+id/omnibox_results_container" | 62 android:inflatedId="@+id/omnibox_results_container" |
56 android:layout="@layout/omnibox_results_container" /> | 63 android:layout="@layout/omnibox_results_container" /> |
57 | 64 |
58 <ImageView | 65 <ImageView |
59 android:id="@+id/toolbar_shadow" | 66 android:id="@+id/toolbar_shadow" |
60 android:src="@drawable/toolbar_shadow" | 67 android:src="@drawable/toolbar_shadow" |
61 android:layout_width="match_parent" | 68 android:layout_width="match_parent" |
62 android:layout_height="wrap_content" | 69 android:layout_height="wrap_content" |
63 android:scaleType="fitXY" | 70 android:scaleType="fitXY" |
64 android:contentDescription="@null" /> | 71 android:contentDescription="@null" /> |
65 | 72 |
66 </org.chromium.chrome.browser.widget.BottomSheet> | 73 </org.chromium.chrome.browser.widget.BottomSheet> |
OLD | NEW |