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

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

Issue 2652883002: Omnibox results show correctly for Chrome Home (Closed)
Patch Set: nit 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
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2016 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2016 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 <org.chromium.chrome.browser.widget.BottomSheet 6 <org.chromium.chrome.browser.widget.BottomSheet
7 xmlns:android="http://schemas.android.com/apk/res/android" 7 xmlns:android="http://schemas.android.com/apk/res/android"
8 android:id="@+id/bottom_sheet" 8 android:id="@+id/bottom_sheet"
9 android:layout_width="match_parent" 9 android:layout_width="match_parent"
10 android:layout_height="wrap_content" > 10 android:layout_height="wrap_content" >
11 11
12 <org.chromium.chrome.browser.toolbar.ToolbarControlContainer 12 <org.chromium.chrome.browser.toolbar.ToolbarControlContainer
13 android:id="@+id/control_container" 13 android:id="@+id/control_container"
14 android:layout_width="match_parent" 14 android:layout_width="match_parent"
15 android:layout_height="wrap_content" 15 android:layout_height="wrap_content"
16 android:minHeight="@dimen/control_container_height" > 16 android:minHeight="@dimen/control_container_height" >
17 <view 17 <view
18 class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$T oolbarViewResourceFrameLayout" 18 class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$T oolbarViewResourceFrameLayout"
19 android:id="@+id/toolbar_container" 19 android:id="@+id/toolbar_container"
20 android:layout_width="match_parent" 20 android:layout_width="match_parent"
21 android:layout_height="wrap_content"> 21 android:layout_height="wrap_content">
22 <ImageView 22 <ImageView
23 android:id="@+id/toolbar_shadow" 23 android:id="@+id/bottom_toolbar_shadow"
24 android:layout_width="match_parent" 24 android:layout_width="match_parent"
25 android:layout_height="@dimen/toolbar_shadow_height" 25 android:layout_height="@dimen/toolbar_shadow_height"
26 android:src="@drawable/toolbar_shadow" 26 android:src="@drawable/toolbar_shadow"
27 android:scaleType="fitXY" 27 android:scaleType="fitXY"
28 android:scaleY="-1" 28 android:scaleY="-1"
29 android:contentDescription="@null" /> 29 android:contentDescription="@null" />
30 <ViewStub 30 <ViewStub
31 android:id="@+id/toolbar_stub" 31 android:id="@+id/toolbar_stub"
32 android:layout_width="match_parent" 32 android:layout_width="match_parent"
33 android:layout_height="@dimen/toolbar_height_no_shadow" 33 android:layout_height="@dimen/toolbar_height_no_shadow"
34 android:layout_marginTop="@dimen/toolbar_shadow_height" /> 34 android:layout_marginTop="@dimen/toolbar_shadow_height" />
35 <ViewStub 35 <ViewStub
36 android:id="@+id/find_toolbar_stub" 36 android:id="@+id/find_toolbar_stub"
37 android:inflatedId="@+id/find_toolbar" 37 android:inflatedId="@+id/find_toolbar"
38 android:layout_marginTop="@dimen/toolbar_shadow_height" 38 android:layout_marginTop="@dimen/toolbar_shadow_height"
39 android:layout_width="match_parent" 39 android:layout_width="match_parent"
40 android:layout_height="@dimen/toolbar_height_no_shadow" 40 android:layout_height="@dimen/toolbar_height_no_shadow"
41 android:layout="@layout/find_toolbar" 41 android:layout="@layout/find_toolbar"
42 android:visibility="gone" /> 42 android:visibility="gone" />
43 </view> 43 </view>
44 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer> 44 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer>
45 45
46 <FrameLayout 46 <FrameLayout
47 android:id="@+id/bottom_sheet_content" 47 android:id="@+id/bottom_sheet_content"
48 android:layout_width="match_parent" 48 android:layout_width="match_parent"
49 android:layout_height="match_parent" 49 android:layout_height="match_parent"
50 android:background="@android:color/white" /> 50 android:background="@android:color/white" />
51 51
52 <ViewStub
53 android:id="@+id/bottom_omnibox_results_container_stub"
54 android:layout_width="match_parent"
55 android:layout_height="wrap_content"
56 android:inflatedId="@+id/omnibox_results_container"
57 android:layout="@layout/omnibox_results_container" />
58
59 <ImageView
60 android:id="@+id/toolbar_shadow"
61 android:src="@drawable/toolbar_shadow"
62 android:layout_width="match_parent"
63 android:layout_height="wrap_content"
64 android:scaleType="fitXY"
65 android:contentDescription="@null" />
66
52 </org.chromium.chrome.browser.widget.BottomSheet> 67 </org.chromium.chrome.browser.widget.BottomSheet>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698