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"> |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 android:layout_height="match_parent" /> | 71 android:layout_height="match_parent" /> |
72 | 72 |
73 <ViewStub | 73 <ViewStub |
74 android:id="@+id/bottom_nav_stub" | 74 android:id="@+id/bottom_nav_stub" |
75 android:layout_width="match_parent" | 75 android:layout_width="match_parent" |
76 android:layout_height="@dimen/bottom_nav_height" | 76 android:layout_height="@dimen/bottom_nav_height" |
77 android:layout_gravity="start|bottom" | 77 android:layout_gravity="start|bottom" |
78 android:inflatedId="@+id/bottom_nav" | 78 android:inflatedId="@+id/bottom_nav" |
79 android:layout="@layout/bottom_sheet_bottom_nav" /> | 79 android:layout="@layout/bottom_sheet_bottom_nav" /> |
80 | 80 |
| 81 <FrameLayout |
| 82 android:id="@+id/bottom_sheet_snackbar_container" |
| 83 android:layout_width="match_parent" |
| 84 android:layout_height="match_parent" |
| 85 android:layout_gravity="start|bottom" |
| 86 android:layout_marginTop="@dimen/bottom_nav_height_inverse" /> |
| 87 |
81 </android.support.design.widget.CoordinatorLayout> | 88 </android.support.design.widget.CoordinatorLayout> |
82 | 89 |
83 <HorizontalScrollView | 90 <HorizontalScrollView |
84 android:id="@+id/keyboard_accessory" | 91 android:id="@+id/keyboard_accessory" |
85 android:layout_height="@dimen/keyboard_accessory_height" | 92 android:layout_height="@dimen/keyboard_accessory_height" |
86 android:layout_width="match_parent" | 93 android:layout_width="match_parent" |
87 android:background="@drawable/keyboard_accessory_background" | 94 android:background="@drawable/keyboard_accessory_background" |
88 android:contentDescription="@string/autofill_keyboard_accessory_cont
ent_description" | 95 android:contentDescription="@string/autofill_keyboard_accessory_cont
ent_description" |
89 android:fillViewport="true" | 96 android:fillViewport="true" |
90 android:scrollbars="none" | 97 android:scrollbars="none" |
91 android:visibility="gone" /> | 98 android:visibility="gone" /> |
92 </LinearLayout> | 99 </LinearLayout> |
93 | 100 |
94 <!-- This empty view is used as the anchor for custom menu --> | 101 <!-- This empty view is used as the anchor for custom menu --> |
95 <View | 102 <View |
96 android:id="@+id/menu_anchor_stub" | 103 android:id="@+id/menu_anchor_stub" |
97 android:layout_width="0px" | 104 android:layout_width="0px" |
98 android:layout_height="0px" | 105 android:layout_height="0px" |
99 android:layout_gravity="bottom|start" | 106 android:layout_gravity="bottom|start" |
100 /> | 107 /> |
101 </merge> | 108 </merge> |
OLD | NEW |