1 files changed, 21 insertions, 21 deletions
diff --git a/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_content.xml b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_content.xml
index 5de9f1f..42d8af4 100644
--- a/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_content.xml
+++ b/chromium/overlay/frameworks/base/core/res/res/layout/webviewchromium_color_picker_dialog_content.xml
@@ -4,48 +4,48 @@
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<LinearLayout 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">
 
-    <com.android.org.chromium.ui.ColorPickerAdvanced
-        android:id="@+id/webviewchromium_color_picker_advanced"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content">
 
-    <FrameLayout
-        android:id="@+id/webviewchromium_color_picker_simple_border"
+        <com.android.org.chromium.ui.ColorPickerAdvanced
+            android:id="@+id/webviewchromium_color_picker_advanced"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </ScrollView>
+
+    <com.android.org.chromium.ui.ColorPickerSimple
+        android:id="@+id/webviewchromium_color_picker_simple"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/webviewchromium_color_picker_border"
+        android:divider="@color/webviewchromium_color_picker_border_color"
+        android:dividerHeight="1px"
         android:paddingStart="1px"
         android:paddingEnd="1px"
-        android:paddingTop="1px">
-
-
-        <com.android.org.chromium.ui.ColorPickerSimple
-            android:id="@+id/webviewchromium_color_picker_simple"
-            android:layout_width="match_parent"
-            android:layout_height="100dp"/>
-    </FrameLayout>
+        android:paddingTop="1px"
+        android:background="@drawable/webviewchromium_color_picker_border" />
 
     <FrameLayout
         android:id="@+id/webviewchromium_color_picker_more_colors_button_border"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/webviewchromium_color_picker_simple_border"
         android:background="@drawable/webviewchromium_color_picker_border"
         android:padding="1px">
 
-        <Button
+        <com.android.org.chromium.ui.ColorPickerMoreButton
             android:id="@+id/webviewchromium_color_picker_more_colors_button"
             style="?android:attr/buttonBarButtonStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="60dip"
+            android:minHeight="48dp"
+            android:textAppearance="?android:attr/textAppearanceSmall"
             android:text="@string/webviewchromium_color_picker_button_more" />
     </FrameLayout>
-
-</RelativeLayout>
+</LinearLayout>