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

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

Issue 1260583004: Gray horizontal keyboard accessory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 <org.chromium.chrome.browser.compositor.CompositorViewHolder 12 <org.chromium.chrome.browser.compositor.CompositorViewHolder
13 android:id="@+id/compositor_view_holder" 13 android:id="@+id/compositor_view_holder"
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 <FrameLayout 18 <HorizontalScrollView
19 android:background="#FFF"
19 android:id="@+id/keyboard_accessory" 20 android:id="@+id/keyboard_accessory"
21 android:layout_height="wrap_content"
20 android:layout_width="match_parent" 22 android:layout_width="match_parent"
21 android:layout_height="wrap_content" 23 android:paddingEnd="@dimen/keyboard_accessory_half_padding"
aurimas (slooooooooow) 2015/07/28 00:10:28 Do we want to add the padding to the scroll view o
please use gerrit instead 2015/07/28 21:07:46 Done.
24 android:paddingStart="@dimen/keyboard_accessory_half_padding"
22 android:visibility="gone" /> 25 android:visibility="gone" />
23 </LinearLayout> 26 </LinearLayout>
24 27
25 <ViewStub 28 <ViewStub
26 android:id="@+id/omnibox_results_container_stub" 29 android:id="@+id/omnibox_results_container_stub"
27 android:layout_width="match_parent" 30 android:layout_width="match_parent"
28 android:layout_height="match_parent" 31 android:layout_height="match_parent"
29 android:layout_marginTop="@dimen/tab_strip_height" 32 android:layout_marginTop="@dimen/tab_strip_height"
30 android:inflatedId="@+id/omnibox_results_container" 33 android:inflatedId="@+id/omnibox_results_container"
31 android:layout="@layout/omnibox_results_container" /> 34 android:layout="@layout/omnibox_results_container" />
(...skipping 17 matching lines...) Expand all
49 android:layout_height="match_parent" 52 android:layout_height="match_parent"
50 /> 53 />
51 <!-- This empty view is used as the anchor for custom menu --> 54 <!-- This empty view is used as the anchor for custom menu -->
52 <View 55 <View
53 android:id="@+id/menu_anchor_stub" 56 android:id="@+id/menu_anchor_stub"
54 android:layout_width="0px" 57 android:layout_width="0px"
55 android:layout_height="0px" 58 android:layout_height="0px"
56 android:layout_gravity="bottom|start" 59 android:layout_gravity="bottom|start"
57 /> 60 />
58 </merge> 61 </merge>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698