Chromium Code Reviews| Index: chrome/android/java/res/layout/main.xml |
| diff --git a/chrome/android/java/res/layout/main.xml b/chrome/android/java/res/layout/main.xml |
| index 54c916c758b36ed4c34014cf29576691d3096efe..b1767cd41fe4e0e63aae8e3bd83ef99c19692ce0 100644 |
| --- a/chrome/android/java/res/layout/main.xml |
| +++ b/chrome/android/java/res/layout/main.xml |
| @@ -3,7 +3,8 @@ |
| Use of this source code is governed by a BSD-style license that can be |
| found in the LICENSE file. --> |
| -<merge xmlns:android="http://schemas.android.com/apk/res/android"> |
| +<merge xmlns:android="http://schemas.android.com/apk/res/android" |
| + xmlns:app="http://schemas.android.com/apk/res-auto"> |
| <LinearLayout |
| android:layout_width="match_parent" |
| android:layout_height="match_parent" |
| @@ -70,6 +71,17 @@ |
| android:layout_width="match_parent" |
| android:layout_height="match_parent" /> |
| + <org.chromium.chrome.browser.widget.BottomSheetBottomNav |
|
mdjones
2017/03/09 16:52:10
Since this is on the main layout, should we condit
Theresa
2017/03/09 17:55:44
Done. No, I think resources are still allocated ev
|
| + android:id="@+id/bottom_nav" |
| + android:layout_width="match_parent" |
| + android:layout_height="@dimen/bottom_nav_height" |
| + android:layout_gravity="start|bottom" |
| + android:background="@color/appbar_background" |
| + app:menu="@menu/bottom_sheet_nav_menu" |
| + app:itemIconTint="@color/bottom_nav_tint" |
| + app:itemTextColor="@color/bottom_nav_tint" |
| + android:visibility="gone" /> |
| + |
| </android.support.design.widget.CoordinatorLayout> |
| <HorizontalScrollView |