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 <org.chromium.chrome.browser.toolbar.ToolbarControlContainer xmlns:android="http ://schemas.android.com/apk/res/android" | 5 |
6 android:id="@+id/control_container" | 6 <org.chromium.chrome.browser.widget.BottomSheet |
7 xmlns:android="http://schemas.android.com/apk/res/android" | |
8 android:id="@+id/bottom_sheet" | |
7 android:layout_width="match_parent" | 9 android:layout_width="match_parent" |
8 android:layout_height="wrap_content" | 10 android:layout_height="wrap_content" > |
9 android:layout_gravity="bottom" | 11 |
10 android:minHeight="@dimen/control_container_height" > | 12 <LinearLayout |
11 <view | 13 android:id="@+id/bottom_sheet_content_wrapper" |
Ian Wen
2017/01/11 19:46:53
This linear layout might not be necessary. You can
mdjones
2017/01/12 21:26:57
Removed.
| |
12 class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$Toolb arViewResourceFrameLayout" | |
13 android:id="@+id/toolbar_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 <ImageView | 16 android:orientation="vertical" > |
17 android:id="@+id/toolbar_shadow" | 17 |
18 <org.chromium.chrome.browser.toolbar.ToolbarControlContainer | |
19 android:id="@+id/control_container" | |
18 android:layout_width="match_parent" | 20 android:layout_width="match_parent" |
19 android:layout_height="@dimen/toolbar_shadow_height" | 21 android:layout_height="wrap_content" |
20 android:src="@drawable/toolbar_shadow" | 22 android:minHeight="@dimen/control_container_height" > |
21 android:scaleType="fitXY" | 23 <view |
22 android:scaleY="-1" | 24 class="org.chromium.chrome.browser.toolbar.ToolbarControlContain er$ToolbarViewResourceFrameLayout" |
23 android:contentDescription="@null" /> | 25 android:id="@+id/toolbar_container" |
24 <ViewStub | 26 android:layout_width="match_parent" |
25 android:id="@+id/toolbar_stub" | 27 android:layout_height="wrap_content"> |
28 <ImageView | |
29 android:id="@+id/toolbar_shadow" | |
30 android:layout_width="match_parent" | |
31 android:layout_height="@dimen/toolbar_shadow_height" | |
32 android:src="@drawable/toolbar_shadow" | |
33 android:scaleType="fitXY" | |
34 android:scaleY="-1" | |
35 android:contentDescription="@null" /> | |
36 <ViewStub | |
37 android:id="@+id/toolbar_stub" | |
38 android:layout_width="match_parent" | |
39 android:layout_height="@dimen/toolbar_height_no_shadow" | |
40 android:layout_marginTop="@dimen/toolbar_shadow_height" /> | |
41 <ViewStub | |
42 android:id="@+id/find_toolbar_stub" | |
43 android:inflatedId="@+id/find_toolbar" | |
44 android:visibility="gone" | |
45 android:layout_marginTop="@dimen/toolbar_shadow_height" | |
46 android:layout_width="match_parent" | |
47 android:layout_height="@dimen/toolbar_height_no_shadow" | |
48 android:layout="@layout/find_toolbar" /> | |
49 </view> | |
50 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer> | |
51 | |
52 <View | |
53 android:id="@+id/bottom_sheet_content" | |
26 android:layout_width="match_parent" | 54 android:layout_width="match_parent" |
27 android:layout_height="@dimen/toolbar_height_no_shadow" | 55 android:layout_height="match_parent" |
28 android:layout_marginTop="@dimen/toolbar_shadow_height" /> | 56 android:background="@android:color/white" /> |
29 <ViewStub | 57 |
30 android:id="@+id/find_toolbar_stub" | 58 </LinearLayout> |
31 android:inflatedId="@+id/find_toolbar" | 59 </org.chromium.chrome.browser.widget.BottomSheet> |
32 android:visibility="gone" | |
33 android:layout_marginTop="@dimen/toolbar_shadow_height" | |
34 android:layout_width="match_parent" | |
35 android:layout_height="@dimen/toolbar_height_no_shadow" | |
36 android:layout="@layout/find_toolbar" /> | |
37 </view> | |
38 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer> | |
OLD | NEW |