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

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

Issue 2846663002: Peek new infobars behind existing ones (Closed)
Patch Set: Created 3 years, 7 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 <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">
11 11
12 <android.support.design.widget.CoordinatorLayout 12 <android.support.design.widget.CoordinatorLayout
13 android:id="@+id/coordinator" 13 android:id="@+id/coordinator"
14 android:layout_width="match_parent" 14 android:layout_width="match_parent"
15 android:layout_height="0dp" 15 android:layout_height="0dp"
16 android:layout_weight="1" > 16 android:layout_weight="1" >
17 17
18 <org.chromium.chrome.browser.compositor.CompositorViewHolder 18 <org.chromium.chrome.browser.compositor.CompositorViewHolder
19 android:id="@+id/compositor_view_holder" 19 android:id="@+id/compositor_view_holder"
20 android:layout_width="match_parent" 20 android:layout_width="match_parent"
21 android:layout_height="match_parent" /> 21 android:layout_height="match_parent" />
22 22
23 <org.chromium.chrome.browser.snackbar.BottomContainer 23 <org.chromium.chrome.browser.snackbar.BottomContainer
24 android:id="@+id/bottom_container" 24 android:id="@+id/bottom_container"
25 android:layout_width="match_parent" 25 android:layout_width="match_parent"
26 android:layout_height="match_parent" 26 android:layout_height="match_parent"
27 android:layout_gravity="start|bottom" /> 27 android:layout_gravity="start|bottom"
28 android:clipChildren="false" />
Ted C 2017/05/17 17:55:54 I think we should conditionally set this. I have
mdjones 2017/05/17 21:05:19 I changed this to be set based on whether the info
28 29
29 <ViewStub 30 <ViewStub
30 android:id="@+id/bottombar_stub" 31 android:id="@+id/bottombar_stub"
31 android:layout_width="match_parent" 32 android:layout_width="match_parent"
32 android:layout_height="wrap_content" 33 android:layout_height="wrap_content"
33 android:layout_marginTop="-4dp" 34 android:layout_marginTop="-4dp"
34 android:layout_gravity="start|bottom" 35 android:layout_gravity="start|bottom"
35 android:inflatedId="@+id/bottombar" 36 android:inflatedId="@+id/bottombar"
36 android:layout="@layout/custom_tabs_bottombar" /> 37 android:layout="@layout/custom_tabs_bottombar" />
37 38
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 </LinearLayout> 100 </LinearLayout>
100 101
101 <!-- This empty view is used as the anchor for custom menu --> 102 <!-- This empty view is used as the anchor for custom menu -->
102 <View 103 <View
103 android:id="@+id/menu_anchor_stub" 104 android:id="@+id/menu_anchor_stub"
104 android:layout_width="0px" 105 android:layout_width="0px"
105 android:layout_height="0px" 106 android:layout_height="0px"
106 android:layout_gravity="bottom|start" 107 android:layout_gravity="bottom|start"
107 /> 108 />
108 </merge> 109 </merge>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698