Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

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, 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
OLDNEW
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/15 18:00:15 Repeating this so it doesn't get lost: what does t
keishi 2013/10/16 04:47:23 Great idea. I tested this and it worked properly.
newt (away) 2013/10/22 04:04:48 Great. Thanks for checking.
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:paddingBottom="1px"
34 android:layout_marginBottom="-1px"
newt (away) 2013/10/15 18:00:15 why add paddingBottom and negative marginBottom? s
keishi 2013/10/16 04:47:23 Done.
35 android:background="@drawable/color_picker_border" />
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:background="@drawable/color_picker_border"
42 android:padding="1px">
43
44 <org.chromium.ui.ColorPickerMoreButton
45 android:id="@+id/more_colors_button"
46 style="?android:attr/buttonBarButtonStyle"
24 android:layout_width="match_parent" 47 android:layout_width="match_parent"
25 android:layout_height="wrap_content" 48 android:layout_height="wrap_content"
26 android:background="@drawable/color_picker_border" 49 android:minHeight="48dp"
27 android:paddingStart="1px" 50 android:textAppearance="?android:attr/textAppearanceSmall"
28 android:paddingEnd="1px" 51 android:text="@string/color_picker_button_more" />
29 android:paddingTop="1px"> 52 </FrameLayout>
30 53 </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>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698