Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1246)

Side by Side Diff: chrome/android/java/res/layout/main.xml

Issue 2738843003: [Home] Add a bottom navigation bar for the BottomSheet (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 xmlns:app="http://schemas.android.com/apk/res-auto">
7 <LinearLayout 8 <LinearLayout
8 android:layout_width="match_parent" 9 android:layout_width="match_parent"
9 android:layout_height="match_parent" 10 android:layout_height="match_parent"
10 android:orientation="vertical"> 11 android:orientation="vertical">
11 12
12 <android.support.design.widget.CoordinatorLayout 13 <android.support.design.widget.CoordinatorLayout
13 android:id="@+id/coordinator" 14 android:id="@+id/coordinator"
14 android:layout_width="match_parent" 15 android:layout_width="match_parent"
15 android:layout_height="0dp" 16 android:layout_height="0dp"
16 android:layout_weight="1" > 17 android:layout_weight="1" >
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 android:layout_width="match_parent" 64 android:layout_width="match_parent"
64 android:layout_height="wrap_content" /> 65 android:layout_height="wrap_content" />
65 66
66 <ViewStub 67 <ViewStub
67 android:id="@+id/empty_container_stub" 68 android:id="@+id/empty_container_stub"
68 android:inflatedId="@+id/empty_container" 69 android:inflatedId="@+id/empty_container"
69 android:layout="@layout/empty_background_view_tablet" 70 android:layout="@layout/empty_background_view_tablet"
70 android:layout_width="match_parent" 71 android:layout_width="match_parent"
71 android:layout_height="match_parent" /> 72 android:layout_height="match_parent" />
72 73
74 <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
75 android:id="@+id/bottom_nav"
76 android:layout_width="match_parent"
77 android:layout_height="@dimen/bottom_nav_height"
78 android:layout_gravity="start|bottom"
79 android:background="@color/appbar_background"
80 app:menu="@menu/bottom_sheet_nav_menu"
81 app:itemIconTint="@color/bottom_nav_tint"
82 app:itemTextColor="@color/bottom_nav_tint"
83 android:visibility="gone" />
84
73 </android.support.design.widget.CoordinatorLayout> 85 </android.support.design.widget.CoordinatorLayout>
74 86
75 <HorizontalScrollView 87 <HorizontalScrollView
76 android:id="@+id/keyboard_accessory" 88 android:id="@+id/keyboard_accessory"
77 android:layout_height="@dimen/keyboard_accessory_height" 89 android:layout_height="@dimen/keyboard_accessory_height"
78 android:layout_width="match_parent" 90 android:layout_width="match_parent"
79 android:background="@drawable/keyboard_accessory_background" 91 android:background="@drawable/keyboard_accessory_background"
80 android:contentDescription="@string/autofill_keyboard_accessory_cont ent_description" 92 android:contentDescription="@string/autofill_keyboard_accessory_cont ent_description"
81 android:fillViewport="true" 93 android:fillViewport="true"
82 android:scrollbars="none" 94 android:scrollbars="none"
83 android:visibility="gone" /> 95 android:visibility="gone" />
84 </LinearLayout> 96 </LinearLayout>
85 97
86 <!-- This empty view is used as the anchor for custom menu --> 98 <!-- This empty view is used as the anchor for custom menu -->
87 <View 99 <View
88 android:id="@+id/menu_anchor_stub" 100 android:id="@+id/menu_anchor_stub"
89 android:layout_width="0px" 101 android:layout_width="0px"
90 android:layout_height="0px" 102 android:layout_height="0px"
91 android:layout_gravity="bottom|start" 103 android:layout_gravity="bottom|start"
92 /> 104 />
93 </merge> 105 </merge>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698