OLD | NEW |
---|---|
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 <RelativeLayout |
newt (away)
2015/08/06 03:27:22
No more nesting :O
We've already introduced one n
please use gerrit instead
2015/08/07 18:43:28
I've placed the shadow inside of the keyboard acce
| |
13 android:id="@+id/compositor_view_holder" | |
14 android:layout_width="match_parent" | |
15 android:layout_height="0dp" | 13 android:layout_height="0dp" |
16 android:layout_weight="1" /> | 14 android:layout_weight="1" |
15 android:layout_width="match_parent"> | |
16 | |
17 <org.chromium.chrome.browser.compositor.CompositorViewHolder | |
18 android:id="@+id/compositor_view_holder" | |
19 android:layout_alignParentBottom="true" | |
20 android:layout_height="match_parent" | |
21 android:layout_width="match_parent" /> | |
22 | |
23 <View | |
24 android:id="@+id/keyboard_accessory_shadow" | |
25 android:layout_alignParentBottom="true" | |
26 android:layout_height="2dp" | |
27 android:layout_width="match_parent" | |
28 android:background="@drawable/keyboard_accessory_shadow" | |
29 android:visibility="gone" /> | |
30 </RelativeLayout> | |
17 | 31 |
18 <HorizontalScrollView | 32 <HorizontalScrollView |
19 android:id="@+id/keyboard_accessory" | 33 android:id="@+id/keyboard_accessory" |
20 android:layout_height="@dimen/keyboard_accessory_height" | 34 android:layout_height="@dimen/keyboard_accessory_height" |
21 android:layout_width="match_parent" | 35 android:layout_width="match_parent" |
22 android:background="#FFF" | 36 android:background="#FFF" |
23 android:scrollbars="none" | 37 android:scrollbars="none" |
24 android:visibility="gone" /> | 38 android:visibility="gone" /> |
25 </LinearLayout> | 39 </LinearLayout> |
26 | 40 |
(...skipping 24 matching lines...) Expand all Loading... | |
51 android:layout_height="match_parent" | 65 android:layout_height="match_parent" |
52 /> | 66 /> |
53 <!-- This empty view is used as the anchor for custom menu --> | 67 <!-- This empty view is used as the anchor for custom menu --> |
54 <View | 68 <View |
55 android:id="@+id/menu_anchor_stub" | 69 android:id="@+id/menu_anchor_stub" |
56 android:layout_width="0px" | 70 android:layout_width="0px" |
57 android:layout_height="0px" | 71 android:layout_height="0px" |
58 android:layout_gravity="bottom|start" | 72 android:layout_gravity="bottom|start" |
59 /> | 73 /> |
60 </merge> | 74 </merge> |
OLD | NEW |