summaryrefslogtreecommitdiffstats
path: root/ui/android/java/res
diff options
context:
space:
mode:
authorpaulnavin@google.com <paulnavin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-26 13:06:18 +0000
committerpaulnavin@google.com <paulnavin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-26 13:06:18 +0000
commitfee0d75527b2a9b3e23e017dab06e07d3334045c (patch)
treef1178833b63ffaf8e06096b8799675c42b809a92 /ui/android/java/res
parent593beab8c7b077411cda1684f7e4f3a912482c6f (diff)
downloadchromium_src-fee0d75527b2a9b3e23e017dab06e07d3334045c.zip
chromium_src-fee0d75527b2a9b3e23e017dab06e07d3334045c.tar.gz
chromium_src-fee0d75527b2a9b3e23e017dab06e07d3334045c.tar.bz2
Color Picker "More" button looks more button-like.
I've modified the UI for the "More" button in accordance with the UI suggestions. I've darkened the border, and added a white inner shadow. I've also made the border thinner to match the Set and Cancel buttons, and made the button smaller to match the size of the Set and Cancel buttons. BUG=261531 Review URL: https://chromiumcodereview.appspot.com/20084004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/android/java/res')
-rw-r--r--ui/android/java/res/drawable/color_picker_border.xml2
-rw-r--r--ui/android/java/res/layout/color_picker_dialog_content.xml11
-rw-r--r--ui/android/java/res/layout/color_picker_dialog_title.xml2
3 files changed, 9 insertions, 6 deletions
diff --git a/ui/android/java/res/drawable/color_picker_border.xml b/ui/android/java/res/drawable/color_picker_border.xml
index 87c0feb..4318c43 100644
--- a/ui/android/java/res/drawable/color_picker_border.xml
+++ b/ui/android/java/res/drawable/color_picker_border.xml
@@ -6,5 +6,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#00000000"/>
- <stroke android:width="1px" android:color="#D0D0D0" />
+ <stroke android:width="1px" android:color="#B0B0B0" />
</shape> \ No newline at end of file
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 9a3c763..fb7bd94 100644
--- a/ui/android/java/res/layout/color_picker_dialog_content.xml
+++ b/ui/android/java/res/layout/color_picker_dialog_content.xml
@@ -24,7 +24,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/color_picker_border"
- android:padding="1dp">
+ android:padding="2px">
<org.chromium.ui.ColorPickerSimple
android:id="@+id/color_picker_simple"
@@ -38,14 +38,17 @@
android:layout_height="wrap_content"
android:layout_below="@+id/color_picker_simple_border"
android:background="@drawable/color_picker_border"
- android:padding="1dp">
+ android:paddingStart="1px"
+ android:paddingEnd="1px"
+ android:paddingBottom="1px">
- <Button
+ <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="60dip"
+ android:minHeight="48dp"
+ android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/color_picker_button_more" />
</FrameLayout>
diff --git a/ui/android/java/res/layout/color_picker_dialog_title.xml b/ui/android/java/res/layout/color_picker_dialog_title.xml
index acb9b73..d97cafb 100644
--- a/ui/android/java/res/layout/color_picker_dialog_title.xml
+++ b/ui/android/java/res/layout/color_picker_dialog_title.xml
@@ -29,7 +29,7 @@
android:layout_alignParentEnd="true"
android:id="@+id/selected_color_view_border"
android:background="@drawable/color_picker_border"
- android:padding="1dp">
+ android:padding="2px">
<View
android:id="@+id/selected_color_view"