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