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/control_container_height" > |
17 <view | 17 <view |
18 class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$T oolbarViewResourceFrameLayout" | 18 class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$T oolbarViewResourceFrameLayout" |
19 android:id="@+id/toolbar_container" | 19 android:id="@+id/toolbar_container" |
20 android:layout_width="match_parent" | 20 android:layout_width="match_parent" |
21 android:layout_height="wrap_content"> | 21 android:layout_height="wrap_content"> |
22 | |
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 |
31 android:id="@+id/toolbar_stub" | 32 <FrameLayout |
33 android:id="@+id/toolbar_holder" | |
32 android:layout_width="match_parent" | 34 android:layout_width="match_parent" |
33 android:layout_height="@dimen/toolbar_height_no_shadow" | 35 android:layout_height="@dimen/toolbar_height_no_shadow" |
Theresa
2017/03/14 16:29:43
This will change to bottom_control_container_heigh
| |
34 android:layout_marginTop="@dimen/toolbar_shadow_height" /> | 36 android:layout_marginTop="@dimen/toolbar_shadow_height" > |
37 <ViewStub | |
38 android:id="@+id/toolbar_stub" | |
39 android:layout_width="match_parent" | |
40 android:layout_height="match_parent" /> | |
41 </FrameLayout> | |
42 | |
35 <ViewStub | 43 <ViewStub |
36 android:id="@+id/find_toolbar_stub" | 44 android:id="@+id/find_toolbar_stub" |
37 android:inflatedId="@+id/find_toolbar" | 45 android:inflatedId="@+id/find_toolbar" |
38 android:layout_marginTop="@dimen/toolbar_shadow_height" | 46 android:layout_marginTop="@dimen/toolbar_shadow_height" |
39 android:layout_width="match_parent" | 47 android:layout_width="match_parent" |
40 android:layout_height="@dimen/toolbar_height_no_shadow" | 48 android:layout_height="@dimen/toolbar_height_no_shadow" |
41 android:layout="@layout/find_toolbar" | 49 android:layout="@layout/find_toolbar" |
42 android:visibility="gone" /> | 50 android:visibility="gone" /> |
43 </view> | 51 </view> |
44 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer> | 52 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer> |
(...skipping 13 matching lines...) Expand all Loading... | |
58 | 66 |
59 <ImageView | 67 <ImageView |
60 android:id="@+id/toolbar_shadow" | 68 android:id="@+id/toolbar_shadow" |
61 android:src="@drawable/toolbar_shadow" | 69 android:src="@drawable/toolbar_shadow" |
62 android:layout_width="match_parent" | 70 android:layout_width="match_parent" |
63 android:layout_height="wrap_content" | 71 android:layout_height="wrap_content" |
64 android:scaleType="fitXY" | 72 android:scaleType="fitXY" |
65 android:contentDescription="@null" /> | 73 android:contentDescription="@null" /> |
66 | 74 |
67 </org.chromium.chrome.browser.widget.BottomSheet> | 75 </org.chromium.chrome.browser.widget.BottomSheet> |
OLD | NEW |