OLD | NEW |
---|---|
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 <!-- | 2 <!-- |
3 Copyright 2013 The Chromium Authors. All rights reserved. | 3 Copyright 2013 The Chromium Authors. All rights reserved. |
4 Use of this source code is governed by a BSD-style license that can be | 4 Use of this source code is governed by a BSD-style license that can be |
5 found in the LICENSE file. | 5 found in the LICENSE file. |
6 --> | 6 --> |
7 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" | 7 |
8 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
8 android:layout_width="match_parent" | 9 android:layout_width="match_parent" |
9 android:layout_height="match_parent"> | 10 android:layout_height="wrap_content" |
11 android:orientation="vertical" | |
12 android:padding="15dp"> | |
10 | 13 |
11 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | 14 <ScrollView |
12 android:layout_width="match_parent" | 15 android:layout_width="match_parent" |
13 android:layout_height="match_parent" | 16 android:layout_height="wrap_content"> |
14 android:orientation="vertical" | |
15 android:padding="15dp"> | |
16 | 17 |
17 <org.chromium.ui.ColorPickerAdvanced | 18 <org.chromium.ui.ColorPickerAdvanced |
18 android:id="@+id/color_picker_advanced" | 19 android:id="@+id/color_picker_advanced" |
19 android:layout_width="match_parent" | 20 android:layout_width="match_parent" |
20 android:layout_height="wrap_content" /> | 21 android:layout_height="wrap_content" /> |
22 </ScrollView> | |
21 | 23 |
22 <FrameLayout | 24 <org.chromium.ui.ColorPickerSimple |
23 android:id="@+id/color_picker_simple_border" | 25 android:id="@+id/color_picker_simple" |
26 android:layout_width="match_parent" | |
27 android:layout_height="wrap_content" | |
28 android:background="@drawable/color_picker_border" | |
29 android:padding="16px" | |
30 android:columnWidth="48dp" | |
31 android:stretchMode="spacingWidth" | |
newt (away)
2013/09/04 17:42:59
does changing this to android:stretchMode="columnW
keishi
2013/09/06 13:09:42
No. According to the source for GridView, it uses
| |
32 android:numColumns="auto_fit" | |
33 android:horizontalSpacing="8dp" | |
34 android:verticalSpacing="8dp" /> | |
35 | |
36 <FrameLayout | |
37 android:id="@+id/more_colors_button_border" | |
38 android:layout_width="match_parent" | |
39 android:layout_height="wrap_content" | |
40 android:background="@drawable/color_picker_border" | |
41 android:padding="1px"> | |
42 | |
43 <org.chromium.ui.ColorPickerMoreButton | |
44 android:id="@+id/more_colors_button" | |
45 style="?android:attr/buttonBarButtonStyle" | |
24 android:layout_width="match_parent" | 46 android:layout_width="match_parent" |
25 android:layout_height="wrap_content" | 47 android:layout_height="wrap_content" |
26 android:background="@drawable/color_picker_border" | 48 android:minHeight="48dp" |
27 android:paddingStart="1px" | 49 android:textAppearance="?android:attr/textAppearanceSmall" |
28 android:paddingEnd="1px" | 50 android:text="@string/color_picker_button_more" /> |
29 android:paddingTop="1px"> | 51 </FrameLayout> |
30 | 52 </LinearLayout> |
31 <org.chromium.ui.ColorPickerSimple | |
32 android:id="@+id/color_picker_simple" | |
33 android:layout_width="match_parent" | |
34 android:layout_height="100dp"/> | |
35 </FrameLayout> | |
36 | |
37 <FrameLayout | |
38 android:id="@+id/more_colors_button_border" | |
39 android:layout_width="match_parent" | |
40 android:layout_height="wrap_content" | |
41 android:layout_below="@+id/color_picker_simple_border" | |
42 android:background="@drawable/color_picker_border" | |
43 android:padding="1px"> | |
44 | |
45 <org.chromium.ui.ColorPickerMoreButton | |
46 android:id="@+id/more_colors_button" | |
47 style="?android:attr/buttonBarButtonStyle" | |
48 android:layout_width="match_parent" | |
49 android:layout_height="wrap_content" | |
50 android:minHeight="48dp" | |
51 android:textAppearance="?android:attr/textAppearanceSmall" | |
52 android:text="@string/color_picker_button_more" /> | |
53 </FrameLayout> | |
54 | |
55 </RelativeLayout> | |
56 </ScrollView> | |
OLD | NEW |