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: Rebased Created 7 years, 2 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

« ui/android/java/res/layout/color_button_row.xml ('K') | « ui/android/java/res/layout/color_button_row.xml ('k') | ui/android/java/res/values/colors.xml » ('j') | ui/android/java/src/org/chromium/ui/ColorPickerSimple.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 <LinearLayout 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">
	newt (away) 2013/10/09 06:07:03 what does the advanced picker look like on a small what does the advanced picker look like on a small screen in landscape after changing the layout_height to wrap_content? Do things look OK, or does the dialog go off the edge of the screen? keishi 2013/10/15 16:44:02 I only have my Nexus 7 so I wasn't able to test wi Show quoted text On 2013/10/09 06:07:03, newt wrote: > what does the advanced picker look like on a small screen in landscape after > changing the layout_height to wrap_content? Do things look OK, or does the > dialog go off the edge of the screen? I only have my Nexus 7 so I wasn't able to test with a small screen. ColorPickerSimple doesn't make the dialog go off the edge so I'm hoping it will be ok. I'll try to test it somehow.
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 <org.chromium.ui.ColorPickerSimple

23 android:id="@+id/color_picker_simple_border"	25 android:id="@+id/color_picker_simple"

	26 android:layout_width="match_parent"

	27 android:layout_height="wrap_content"

	28 android:divider="@color/color_picker_border_color"

	29 android:dividerHeight="1px"

	30 android:paddingStart="1px"

	31 android:paddingEnd="1px"

	32 android:paddingTop="1px"

	33 android:layout_weight="1"
	newt (away) 2013/10/09 06:07:03 don't need layout_weight, right? don't need layout_weight, right? keishi 2013/10/15 16:44:02 Done. Show quoted text On 2013/10/09 06:07:03, newt wrote: > don't need layout_weight, right? Done.
	34 android:background="@drawable/color_picker_border" />

	35

	36 <FrameLayout

	37 android:id="@+id/more_colors_button_border"

	38 android:layout_width="match_parent"

	39 android:layout_height="wrap_content"

	40 android:background="@drawable/color_picker_border"

	41 android:padding="1px">

	42

	43 <org.chromium.ui.ColorPickerMoreButton

	44 android:id="@+id/more_colors_button"

	45 style="?android:attr/buttonBarButtonStyle"

24 android:layout_width="match_parent"	46 android:layout_width="match_parent"

25 android:layout_height="wrap_content"	47 android:layout_height="wrap_content"

26 android:background="@drawable/color_picker_border"	48 android:minHeight="48dp"

27 android:paddingStart="1px"	49 android:textAppearance="?android:attr/textAppearanceSmall"

28 android:paddingEnd="1px"	50 android:text="@string/color_picker_button_more" />

29 android:paddingTop="1px">	51 </FrameLayout>

30	52 </LinearLayout>

31 <org.chromium.ui.ColorPickerSimple

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

33 android:layout_width="match_parent"

34 android:layout_height="100dp"/>

35 </FrameLayout>

36

37 <FrameLayout

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

39 android:layout_width="match_parent"

40 android:layout_height="wrap_content"

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

42 android:background="@drawable/color_picker_border"

43 android:padding="1px">

44

45 <org.chromium.ui.ColorPickerMoreButton

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

47 style="?android:attr/buttonBarButtonStyle"

48 android:layout_width="match_parent"

49 android:layout_height="wrap_content"

50 android:minHeight="48dp"

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

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

53 </FrameLayout>

54

55 </RelativeLayout>

56 </ScrollView>

OLD	NEW