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 | 7 |
8 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 8 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
9 android:layout_width="match_parent" | 9 android:layout_width="match_parent" |
10 android:layout_height="wrap_content" | 10 android:layout_height="wrap_content" |
11 android:orientation="vertical" | 11 android:orientation="vertical" |
12 android:padding="15dp"> | 12 android:padding="15dp"> |
13 | 13 |
14 <ScrollView | 14 <ScrollView |
15 android:layout_width="match_parent" | 15 android:layout_width="match_parent" |
16 android:layout_height="wrap_content"> | 16 android:layout_height="wrap_content"> |
17 | 17 |
18 <org.chromium.ui.ColorPickerAdvanced | 18 <org.chromium.components.web_contents_delegate_android.ColorPickerAdvanc
ed |
19 android:id="@+id/color_picker_advanced" | 19 android:id="@+id/color_picker_advanced" |
20 android:layout_width="match_parent" | 20 android:layout_width="match_parent" |
21 android:layout_height="wrap_content" /> | 21 android:layout_height="wrap_content" /> |
22 </ScrollView> | 22 </ScrollView> |
23 | 23 |
24 <org.chromium.ui.ColorPickerSimple | 24 <org.chromium.components.web_contents_delegate_android.ColorPickerSimple |
25 android:id="@+id/color_picker_simple" | 25 android:id="@+id/color_picker_simple" |
26 android:layout_width="match_parent" | 26 android:layout_width="match_parent" |
27 android:layout_height="wrap_content" | 27 android:layout_height="wrap_content" |
28 android:divider="@color/color_picker_border_color" | 28 android:divider="@color/color_picker_border_color" |
29 android:dividerHeight="1px" | 29 android:dividerHeight="1px" |
30 android:paddingStart="1px" | 30 android:paddingStart="1px" |
31 android:paddingEnd="1px" | 31 android:paddingEnd="1px" |
32 android:paddingTop="1px" | 32 android:paddingTop="1px" |
33 android:background="@drawable/color_picker_border" /> | 33 android:background="@drawable/color_picker_border" /> |
34 | 34 |
35 <FrameLayout | 35 <FrameLayout |
36 android:id="@+id/more_colors_button_border" | 36 android:id="@+id/more_colors_button_border" |
37 android:layout_width="match_parent" | 37 android:layout_width="match_parent" |
38 android:layout_height="wrap_content" | 38 android:layout_height="wrap_content" |
39 android:background="@drawable/color_picker_border" | 39 android:background="@drawable/color_picker_border" |
40 android:padding="1px"> | 40 android:padding="1px"> |
41 | 41 |
42 <org.chromium.ui.ColorPickerMoreButton | 42 <org.chromium.components.web_contents_delegate_android.ColorPickerMoreBu
tton |
43 android:id="@+id/more_colors_button" | 43 android:id="@+id/more_colors_button" |
44 style="?android:attr/buttonBarButtonStyle" | 44 style="?android:attr/buttonBarButtonStyle" |
45 android:layout_width="match_parent" | 45 android:layout_width="match_parent" |
46 android:layout_height="wrap_content" | 46 android:layout_height="wrap_content" |
47 android:minHeight="48dp" | 47 android:minHeight="48dp" |
48 android:textAppearance="?android:attr/textAppearanceSmall" | 48 android:textAppearance="?android:attr/textAppearanceSmall" |
49 android:text="@string/color_picker_button_more" /> | 49 android:text="@string/color_picker_button_more" /> |
50 </FrameLayout> | 50 </FrameLayout> |
51 </LinearLayout> | 51 </LinearLayout> |
OLD | NEW |