| 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..38a492d0b283e6ad4c8290db51f251a0500d53b1 100644
|
| --- a/ui/android/java/res/layout/color_picker_dialog_content.xml
|
| +++ b/ui/android/java/res/layout/color_picker_dialog_content.xml
|
| @@ -4,53 +4,48 @@
|
| 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"
|
| +
|
| +<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">
|
|
|
| - <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"
|
| - android:layout_width="match_parent"
|
| - android:layout_height="wrap_content"
|
| - 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="wrap_content"
|
| + android:divider="@color/color_picker_border_color"
|
| + android:dividerHeight="1px"
|
| + android:paddingStart="1px"
|
| + android:paddingEnd="1px"
|
| + android:paddingTop="1px"
|
| + android:background="@drawable/color_picker_border" />
|
|
|
| - <org.chromium.ui.ColorPickerSimple
|
| - android:id="@+id/color_picker_simple"
|
| - android:layout_width="match_parent"
|
| - android:layout_height="100dp"/>
|
| - </FrameLayout>
|
| + <FrameLayout
|
| + android:id="@+id/more_colors_button_border"
|
| + android:layout_width="match_parent"
|
| + android:layout_height="wrap_content"
|
| + android:background="@drawable/color_picker_border"
|
| + android:padding="1px">
|
|
|
| - <FrameLayout
|
| - android:id="@+id/more_colors_button_border"
|
| + <org.chromium.ui.ColorPickerMoreButton
|
| + android:id="@+id/more_colors_button"
|
| + style="?android:attr/buttonBarButtonStyle"
|
| 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">
|
| -
|
| - <org.chromium.ui.ColorPickerMoreButton
|
| - android:id="@+id/more_colors_button"
|
| - style="?android:attr/buttonBarButtonStyle"
|
| - android:layout_width="match_parent"
|
| - android:layout_height="wrap_content"
|
| - android:minHeight="48dp"
|
| - android:textAppearance="?android:attr/textAppearanceSmall"
|
| - android:text="@string/color_picker_button_more" />
|
| - </FrameLayout>
|
| -
|
| - </RelativeLayout>
|
| -</ScrollView>
|
| + android:minHeight="48dp"
|
| + android:textAppearance="?android:attr/textAppearanceSmall"
|
| + android:text="@string/color_picker_button_more" />
|
| + </FrameLayout>
|
| +</LinearLayout>
|
|
|