ui/android/java/res/layout/color_picker_dialog_content.xml - Issue 23026006: Add support for color input datalist on Android

Side by Side Diff: ui/android/java/res/layout/color_picker_dialog_content.xml

Issue 23026006: Add support for color input datalist on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <!--	2 <!--

3 Copyright 2013 The Chromium Authors. All rights reserved.	3 Copyright 2013 The Chromium Authors. All rights reserved.

4 Use of this source code is governed by a BSD-style license that can be	4 Use of this source code is governed by a BSD-style license that can be

5 found in the LICENSE file.	5 found in the LICENSE file.

6 -->	6 -->

7 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"	7

	8 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

8 android:layout_width="match_parent"	9 android:layout_width="match_parent"

9 android:layout_height="match_parent">	10 android:layout_height="wrap_content"

	11 android:orientation="vertical"

	12 android:padding="15dp">

10	13

11 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"	14 <ScrollView

12 android:layout_width="match_parent"	15 android:layout_width="match_parent"

13 android:layout_height="match_parent"	16 android:layout_height="wrap_content">

14 android:orientation="vertical"

15 android:padding="15dp">

16	17

17 <org.chromium.ui.ColorPickerAdvanced	18 <org.chromium.ui.ColorPickerAdvanced

18 android:id="@+id/color_picker_advanced"	19 android:id="@+id/color_picker_advanced"

19 android:layout_width="match_parent"	20 android:layout_width="match_parent"

20 android:layout_height="wrap_content" />	21 android:layout_height="wrap_content" />

	22 </ScrollView>

21	23

22 <FrameLayout	24 <LinearLayout
	newt (away) 2013/08/26 20:23:20 you can remove this LinearLayout. The parent Relat you can remove this LinearLayout. The parent RelativeLayout can lay out the views below. keishi 2013/08/29 03:40:47 Done. Show quoted text On 2013/08/26 20:23:20, newt wrote: > you can remove this LinearLayout. The parent RelativeLayout can lay out the > views below. Done.
23 android:id="@+id/color_picker_simple_border"	25 android:layout_width="match_parent"

	26 android:layout_height="wrap_content"

	27 android:orientation="vertical">

	28

	29 <org.chromium.ui.ColorPickerSimple

	30 android:id="@+id/color_picker_simple"

24 android:layout_width="match_parent"	31 android:layout_width="match_parent"

25 android:layout_height="wrap_content"	32 android:layout_height="wrap_content"

	33 android:layout_weight="1"
	newt (away) 2013/08/26 20:23:20 layout_weight="1" doesn't do anything if the paren layout_weight="1" doesn't do anything if the parent has layout_height="wrap_content". I think you can just remove the layout_weight attribute. keishi 2013/08/29 03:40:47 Done. Show quoted text On 2013/08/26 20:23:20, newt wrote: > layout_weight="1" doesn't do anything if the parent has > layout_height="wrap_content". I think you can just remove the layout_weight > attribute. Done.
26 android:background="@drawable/color_picker_border"	34 android:background="@drawable/color_picker_border"

27 android:paddingStart="1px"	35 android:padding="16px"

28 android:paddingEnd="1px"	36 android:columnWidth="48dp"

29 android:paddingTop="1px">	37 android:stretchMode="spacingWidth"
	newt (away) 2013/08/26 20:23:20 how does this look? I'd expect "columnWidth" to lo how does this look? I'd expect "columnWidth" to look better. can you upload screenshots to the bug at a few different widths? keishi 2013/08/29 03:40:47 I wasn't sure how to use GridView to achieve the c Show quoted text On 2013/08/26 20:23:20, newt wrote: > how does this look? I'd expect "columnWidth" to look better. can you upload > screenshots to the bug at a few different widths? I wasn't sure how to use GridView to achieve the current design with gray and white borders so I decided to change the design slightly and used square color buttons. By using spacingWidth the color buttons are always square and the extra space is divided equally among the space between two columns. Here are the screen shots.
30	38 android:numColumns="auto_fit"

31 <org.chromium.ui.ColorPickerSimple	39 android:horizontalSpacing="8dp"
	newt (away) 2013/08/26 20:23:20 this is a lot more spacing than we had before. why this is a lot more spacing than we had before. why the increase? keishi 2013/08/29 03:40:47 I added some space between buttons so they are eas Show quoted text On 2013/08/26 20:23:20, newt wrote: > this is a lot more spacing than we had before. why the increase? I added some space between buttons so they are easier to hit.
32 android:id="@+id/color_picker_simple"	40 android:verticalSpacing="8dp" />

33 android:layout_width="match_parent"

34 android:layout_height="100dp"/>

35 </FrameLayout>

36	41

37 <FrameLayout	42 <FrameLayout

38 android:id="@+id/more_colors_button_border"	43 android:id="@+id/more_colors_button_border"

39 android:layout_width="match_parent"	44 android:layout_width="match_parent"

40 android:layout_height="wrap_content"	45 android:layout_height="wrap_content"

41 android:layout_below="@+id/color_picker_simple_border"

42 android:background="@drawable/color_picker_border"	46 android:background="@drawable/color_picker_border"

43 android:padding="1px">	47 android:padding="1px">

44	48

45 <org.chromium.ui.ColorPickerMoreButton	49 <org.chromium.ui.ColorPickerMoreButton

46 android:id="@+id/more_colors_button"	50 android:id="@+id/more_colors_button"

47 style="?android:attr/buttonBarButtonStyle"	51 style="?android:attr/buttonBarButtonStyle"

48 android:layout_width="match_parent"	52 android:layout_width="match_parent"

49 android:layout_height="wrap_content"	53 android:layout_height="wrap_content"

50 android:minHeight="48dp"	54 android:minHeight="48dp"

51 android:textAppearance="?android:attr/textAppearanceSmall"	55 android:textAppearance="?android:attr/textAppearanceSmall"

52 android:text="@string/color_picker_button_more" />	56 android:text="@string/color_picker_button_more" />

53 </FrameLayout>	57 </FrameLayout>

54	58 </LinearLayout>

55 </RelativeLayout>	59 </RelativeLayout>

56 </ScrollView>

OLD	NEW