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

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

Issue 2623493003: Refactor the view hierarchy of snackbars and infobars (Closed)
Patch Set: comments Created 3 years, 11 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
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 xmlns:app="http://schemas.android.com/apk/res-auto" >
8 <LinearLayout 8 <LinearLayout
9 android:layout_width="match_parent" 9 android:layout_width="match_parent"
10 android:layout_height="match_parent" 10 android:layout_height="match_parent"
11 android:orientation="vertical"> 11 android:orientation="vertical">
12 12
13 <org.chromium.chrome.browser.compositor.CompositorViewHolder 13 <android.support.design.widget.CoordinatorLayout
14 android:id="@+id/compositor_view_holder" 14 android:id="@+id/coordinator"
15 android:layout_width="match_parent" 15 android:layout_width="match_parent"
16 android:layout_height="0dp" 16 android:layout_height="0dp"
17 android:layout_weight="1" > 17 android:layout_weight="1" >
18 18
19 <org.chromium.chrome.browser.compositor.CompositorViewHolder
20 android:id="@+id/compositor_view_holder"
21 android:layout_width="match_parent"
22 android:layout_height="match_parent" />
23
19 <ViewStub 24 <ViewStub
20 android:id="@+id/omnibox_results_container_stub" 25 android:id="@+id/omnibox_results_container_stub"
21 android:layout_width="match_parent" 26 android:layout_width="match_parent"
22 android:layout_height="match_parent" 27 android:layout_height="match_parent"
23 android:layout_marginTop="@dimen/tab_strip_height" 28 android:layout_marginTop="@dimen/tab_strip_height"
24 android:inflatedId="@+id/omnibox_results_container" 29 android:inflatedId="@+id/omnibox_results_container"
25 android:layout="@layout/omnibox_results_container" 30 android:layout="@layout/omnibox_results_container" />
26 app:layout_behavior="org.chromium.chrome.browser.compositor.Comp ositorViewHolderBehavior" />
27 31
28 </org.chromium.chrome.browser.compositor.CompositorViewHolder> 32 <FrameLayout
33 android:id="@+id/bottom_container"
34 android:layout_width="match_parent"
35 android:layout_height="match_parent"
36 android:layout_gravity="start|bottom" />
37
38 </android.support.design.widget.CoordinatorLayout>
29 39
30 <HorizontalScrollView 40 <HorizontalScrollView
31 android:id="@+id/keyboard_accessory" 41 android:id="@+id/keyboard_accessory"
32 android:layout_height="@dimen/keyboard_accessory_height" 42 android:layout_height="@dimen/keyboard_accessory_height"
33 android:layout_width="match_parent" 43 android:layout_width="match_parent"
34 android:background="@drawable/keyboard_accessory_background" 44 android:background="@drawable/keyboard_accessory_background"
35 android:contentDescription="@string/autofill_keyboard_accessory_cont ent_description" 45 android:contentDescription="@string/autofill_keyboard_accessory_cont ent_description"
36 android:fillViewport="true" 46 android:fillViewport="true"
37 android:scrollbars="none" 47 android:scrollbars="none"
38 android:visibility="gone" /> 48 android:visibility="gone" />
(...skipping 23 matching lines...) Expand all
62 android:layout_width="match_parent" 72 android:layout_width="match_parent"
63 android:layout_height="match_parent" /> 73 android:layout_height="match_parent" />
64 <!-- This empty view is used as the anchor for custom menu --> 74 <!-- This empty view is used as the anchor for custom menu -->
65 <View 75 <View
66 android:id="@+id/menu_anchor_stub" 76 android:id="@+id/menu_anchor_stub"
67 android:layout_width="0px" 77 android:layout_width="0px"
68 android:layout_height="0px" 78 android:layout_height="0px"
69 android:layout_gravity="bottom|start" 79 android:layout_gravity="bottom|start"
70 /> 80 />
71 </merge> 81 </merge>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698