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

Side by Side Diff: chrome/android/java/res/values-v21/styles.xml

Issue 1210153005: Remove custom material styling for EditText in preferences (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@2403
Patch Set: Created 5 years, 5 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
« no previous file with comments | « chrome/android/java/res/color/edit_text_tint.xml ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2014 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2014 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <resources> 6 <resources>
7 <!-- Preferences --> 7 <!-- Preferences -->
8 <style name="PreferencesTheme" parent="ThemeWithActionBar"> 8 <style name="PreferencesTheme" parent="ThemeWithActionBar">
9 <item name="android:textColorLink">@color/pref_accent_color</item> 9 <item name="android:textColorLink">@color/pref_accent_color</item>
10 <item name="android:alertDialogTheme">@style/PreferencesDialogTheme</ite m> 10 <item name="android:alertDialogTheme">@style/PreferencesDialogTheme</ite m>
11 <item name="android:editTextBackground">@drawable/abc_edit_text_material </item>
12 <item name="android:editTextStyle">@style/PreferenceEditTextStyle</item>
13 <item name="android:spinnerItemStyle">@style/PreferenceSpinnerItem</item > 11 <item name="android:spinnerItemStyle">@style/PreferenceSpinnerItem</item >
14 <item name="floatLabelTextAppearance">@style/PreferenceFloatLabelTextApp earance</item> 12 <item name="floatLabelTextAppearance">@style/PreferenceFloatLabelTextApp earance</item>
15 <item name="floatLabelPaddingLeft">@dimen/pref_autofill_field_horizontal _padding</item> 13 <item name="floatLabelPaddingLeft">@dimen/pref_autofill_field_horizontal _padding</item>
16 <item name="floatLabelPaddingRight">@dimen/pref_autofill_field_horizonta l_padding</item> 14 <item name="floatLabelPaddingRight">@dimen/pref_autofill_field_horizonta l_padding</item>
17 <item name="floatLabelPaddingTop">@dimen/pref_autofill_field_top_padding </item> 15 <item name="floatLabelPaddingTop">@dimen/pref_autofill_field_top_padding </item>
18 </style> 16 </style>
19 <style name="PreferencesDialogTheme" parent="@android:style/Theme.Material.L ight.Dialog.Alert"> 17 <style name="PreferencesDialogTheme" parent="@android:style/Theme.Material.L ight.Dialog.Alert">
20 <item name="android:colorAccent">@color/pref_accent_color</item> 18 <item name="android:colorAccent">@color/pref_accent_color</item>
21 </style> 19 </style>
22 <style name="PreferenceCategoryWithButtonStyle"> 20 <style name="PreferenceCategoryWithButtonStyle">
23 <item name="android:paddingStart">?android:attr/listPreferredItemPadding Start</item> 21 <item name="android:paddingStart">?android:attr/listPreferredItemPadding Start</item>
24 <item name="android:paddingEnd">4dp</item> 22 <item name="android:paddingEnd">4dp</item>
25 </style> 23 </style>
26 <style name="PreferenceCategoryTextStyle"> 24 <style name="PreferenceCategoryTextStyle">
27 <item name="android:fontFamily">sans-serif-medium</item> 25 <item name="android:fontFamily">sans-serif-medium</item>
28 <item name="android:textColor">@color/pref_accent_color</item> 26 <item name="android:textColor">@color/pref_accent_color</item>
29 <item name="android:textSize">14sp</item> 27 <item name="android:textSize">14sp</item>
30 </style> 28 </style>
31 <style name="PreferenceEditTextStyle" parent="Widget.AppCompat.EditText">
32 <item name="android:backgroundTint">@color/edit_text_tint</item>
33 </style>
34 <style name="PreferenceTitle"> 29 <style name="PreferenceTitle">
35 <item name="android:ellipsize">end</item> 30 <item name="android:ellipsize">end</item>
36 <item name="android:singleLine">true</item> 31 <item name="android:singleLine">true</item>
37 <item name="android:textAppearance">?android:attr/textAppearanceListItem </item> 32 <item name="android:textAppearance">?android:attr/textAppearanceListItem </item>
38 </style> 33 </style>
39 <style name="PreferenceSummary"> 34 <style name="PreferenceSummary">
40 <item name="android:textAppearance">?android:attr/textAppearanceListItem Secondary</item> 35 <item name="android:textAppearance">?android:attr/textAppearanceListItem Secondary</item>
41 <item name="android:textColor">?android:attr/textColorSecondary</item> 36 <item name="android:textColor">?android:attr/textColorSecondary</item>
42 </style> 37 </style>
43 <style name="PreferenceLayoutBase"> 38 <style name="PreferenceLayoutBase">
(...skipping 19 matching lines...) Expand all
63 parent="@android:style/TextAppearance.Material.Notification.Title"> 58 parent="@android:style/TextAppearance.Material.Notification.Title">
64 <item name="android:layout_marginBottom">4dp</item> 59 <item name="android:layout_marginBottom">4dp</item>
65 </style> 60 </style>
66 <style name="RemoteNotificationText" 61 <style name="RemoteNotificationText"
67 parent="@android:style/TextAppearance.Material.Notification.Line2"/> 62 parent="@android:style/TextAppearance.Material.Notification.Line2"/>
68 <style name="RemoteNotificationProgressBar" parent="@android:style/Widget.Pr ogressBar.Horizontal"> 63 <style name="RemoteNotificationProgressBar" parent="@android:style/Widget.Pr ogressBar.Horizontal">
69 <item name="android:minHeight">5dp</item> 64 <item name="android:minHeight">5dp</item>
70 </style> 65 </style>
71 66
72 </resources> 67 </resources>
OLDNEW
« no previous file with comments | « chrome/android/java/res/color/edit_text_tint.xml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698