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..0bd7193a0dc30763ef6713f467f9b6586e80a724 100644 |
--- a/ui/android/java/res/layout/color_picker_dialog_content.xml |
+++ b/ui/android/java/res/layout/color_picker_dialog_content.xml |
@@ -19,10 +19,10 @@ |
android:layout_width="match_parent" |
android:layout_height="wrap_content" /> |
- <FrameLayout |
+ <ScrollView |
Miguel Garcia
2013/08/19 14:43:27
I adding newt for the UX changes ok?
newt (away)
2013/08/19 23:18:19
Nested ScrollViews are bug-prone and cause weird b
keishi
2013/08/26 05:28:54
I changed ColorPickerSimple to a GridView so we no
|
android:id="@+id/color_picker_simple_border" |
android:layout_width="match_parent" |
- android:layout_height="wrap_content" |
+ android:layout_height="100dp" |
android:background="@drawable/color_picker_border" |
android:paddingStart="1px" |
android:paddingEnd="1px" |
@@ -30,9 +30,10 @@ |
<org.chromium.ui.ColorPickerSimple |
android:id="@+id/color_picker_simple" |
+ android:minHeight="99dp" |
android:layout_width="match_parent" |
- android:layout_height="100dp"/> |
- </FrameLayout> |
+ android:layout_height="match_parent"/> |
+ </ScrollView> |
<FrameLayout |
android:id="@+id/more_colors_button_border" |
@@ -53,4 +54,4 @@ |
</FrameLayout> |
</RelativeLayout> |
-</ScrollView> |
+</ScrollView> |