Index: ui/android/java/res/layout/color_picker_dialog_content.xml |
diff --git a/ui/android/java/res/layout/color_picker_dialog_content.xml b/ui/android/java/res/layout/color_picker_dialog_content.xml |
index 8aa4dbaeffd0dc88f6c72ec0169aa02da10c7422..970a3323f41fdd7d4d809350487cbae36eb22de4 100644 |
--- a/ui/android/java/res/layout/color_picker_dialog_content.xml |
+++ b/ui/android/java/res/layout/color_picker_dialog_content.xml |
@@ -4,41 +4,45 @@ |
Use of this source code is governed by a BSD-style license that can be |
found in the LICENSE file. |
--> |
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" |
+ |
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
android:layout_width="match_parent" |
- android:layout_height="match_parent"> |
+ android:layout_height="wrap_content" |
+ android:orientation="vertical" |
+ android:padding="15dp"> |
- <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
+ <ScrollView |
android:layout_width="match_parent" |
- android:layout_height="match_parent" |
- android:orientation="vertical" |
- android:padding="15dp"> |
+ android:layout_height="wrap_content"> |
<org.chromium.ui.ColorPickerAdvanced |
android:id="@+id/color_picker_advanced" |
android:layout_width="match_parent" |
android:layout_height="wrap_content" /> |
+ </ScrollView> |
- <FrameLayout |
- android:id="@+id/color_picker_simple_border" |
+ <LinearLayout |
newt (away)
2013/08/26 20:23:20
you can remove this LinearLayout. The parent Relat
keishi
2013/08/29 03:40:47
Done.
|
+ android:layout_width="match_parent" |
+ android:layout_height="wrap_content" |
+ android:orientation="vertical"> |
+ |
+ <org.chromium.ui.ColorPickerSimple |
+ android:id="@+id/color_picker_simple" |
android:layout_width="match_parent" |
android:layout_height="wrap_content" |
+ android:layout_weight="1" |
newt (away)
2013/08/26 20:23:20
layout_weight="1" doesn't do anything if the paren
keishi
2013/08/29 03:40:47
Done.
|
android:background="@drawable/color_picker_border" |
- android:paddingStart="1px" |
- android:paddingEnd="1px" |
- android:paddingTop="1px"> |
- |
- <org.chromium.ui.ColorPickerSimple |
- android:id="@+id/color_picker_simple" |
- android:layout_width="match_parent" |
- android:layout_height="100dp"/> |
- </FrameLayout> |
+ android:padding="16px" |
+ android:columnWidth="48dp" |
+ android:stretchMode="spacingWidth" |
newt (away)
2013/08/26 20:23:20
how does this look? I'd expect "columnWidth" to lo
keishi
2013/08/29 03:40:47
I wasn't sure how to use GridView to achieve the c
|
+ android:numColumns="auto_fit" |
+ android:horizontalSpacing="8dp" |
newt (away)
2013/08/26 20:23:20
this is a lot more spacing than we had before. why
keishi
2013/08/29 03:40:47
I added some space between buttons so they are eas
|
+ android:verticalSpacing="8dp" /> |
<FrameLayout |
android:id="@+id/more_colors_button_border" |
android:layout_width="match_parent" |
android:layout_height="wrap_content" |
- android:layout_below="@+id/color_picker_simple_border" |
android:background="@drawable/color_picker_border" |
android:padding="1px"> |
@@ -51,6 +55,5 @@ |
android:textAppearance="?android:attr/textAppearanceSmall" |
android:text="@string/color_picker_button_more" /> |
</FrameLayout> |
- |
- </RelativeLayout> |
-</ScrollView> |
+ </LinearLayout> |
+</RelativeLayout> |