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

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, 4 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 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
8 android:layout_width="match_parent" 8 android:layout_width="match_parent"
9 android:layout_height="match_parent"> 9 android:layout_height="match_parent">
10 10
11 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" 11 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
12 android:layout_width="match_parent" 12 android:layout_width="match_parent"
13 android:layout_height="match_parent" 13 android:layout_height="match_parent"
14 android:orientation="vertical" 14 android:orientation="vertical"
15 android:padding="15dp"> 15 android:padding="15dp">
16 16
17 <org.chromium.ui.ColorPickerAdvanced 17 <org.chromium.ui.ColorPickerAdvanced
18 android:id="@+id/color_picker_advanced" 18 android:id="@+id/color_picker_advanced"
19 android:layout_width="match_parent" 19 android:layout_width="match_parent"
20 android:layout_height="wrap_content" /> 20 android:layout_height="wrap_content" />
21 21
22 <FrameLayout 22 <ScrollView
Miguel Garcia 2013/08/19 14:43:27 I adding newt for the UX changes ok?
newt (away) 2013/08/19 23:18:19 Nested ScrollViews are bug-prone and cause weird b
keishi 2013/08/26 05:28:54 I changed ColorPickerSimple to a GridView so we no
23 android:id="@+id/color_picker_simple_border" 23 android:id="@+id/color_picker_simple_border"
24 android:layout_width="match_parent" 24 android:layout_width="match_parent"
25 android:layout_height="wrap_content" 25 android:layout_height="100dp"
26 android:background="@drawable/color_picker_border" 26 android:background="@drawable/color_picker_border"
27 android:paddingStart="1px" 27 android:paddingStart="1px"
28 android:paddingEnd="1px" 28 android:paddingEnd="1px"
29 android:paddingTop="1px"> 29 android:paddingTop="1px">
30 30
31 <org.chromium.ui.ColorPickerSimple 31 <org.chromium.ui.ColorPickerSimple
32 android:id="@+id/color_picker_simple" 32 android:id="@+id/color_picker_simple"
33 android:minHeight="99dp"
33 android:layout_width="match_parent" 34 android:layout_width="match_parent"
34 android:layout_height="100dp"/> 35 android:layout_height="match_parent"/>
35 </FrameLayout> 36 </ScrollView>
36 37
37 <FrameLayout 38 <FrameLayout
38 android:id="@+id/more_colors_button_border" 39 android:id="@+id/more_colors_button_border"
39 android:layout_width="match_parent" 40 android:layout_width="match_parent"
40 android:layout_height="wrap_content" 41 android:layout_height="wrap_content"
41 android:layout_below="@+id/color_picker_simple_border" 42 android:layout_below="@+id/color_picker_simple_border"
42 android:background="@drawable/color_picker_border" 43 android:background="@drawable/color_picker_border"
43 android:padding="1px"> 44 android:padding="1px">
44 45
45 <org.chromium.ui.ColorPickerMoreButton 46 <org.chromium.ui.ColorPickerMoreButton
46 android:id="@+id/more_colors_button" 47 android:id="@+id/more_colors_button"
47 style="?android:attr/buttonBarButtonStyle" 48 style="?android:attr/buttonBarButtonStyle"
48 android:layout_width="match_parent" 49 android:layout_width="match_parent"
49 android:layout_height="wrap_content" 50 android:layout_height="wrap_content"
50 android:minHeight="48dp" 51 android:minHeight="48dp"
51 android:textAppearance="?android:attr/textAppearanceSmall" 52 android:textAppearance="?android:attr/textAppearanceSmall"
52 android:text="@string/color_picker_button_more" /> 53 android:text="@string/color_picker_button_more" />
53 </FrameLayout> 54 </FrameLayout>
54 55
55 </RelativeLayout> 56 </RelativeLayout>
56 </ScrollView> 57 </ScrollView>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698