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

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

Issue 872023002: Use floating labels for preference forms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change repack_locales condition to just enable_autofill_dialog Created 5 years, 11 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
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 6
7 <resources> 7 <resources>
8 <!-- Preferences --> 8 <!-- Preferences -->
9 <style name="PreferencesTheme" parent="ThemeWithActionBar"> 9 <style name="PreferencesTheme" parent="ThemeWithActionBar">
10 <item name="android:textColorLink">@color/pref_accent_color</item> 10 <item name="android:textColorLink">@color/pref_accent_color</item>
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 <style name="PreferenceTitle"> 44 <style name="PreferenceTitle">
45 <item name="android:ellipsize">end</item> 45 <item name="android:ellipsize">end</item>
46 <item name="android:singleLine">true</item> 46 <item name="android:singleLine">true</item>
47 <item name="android:textAppearance">?android:attr/textAppearanceMedium</ item> 47 <item name="android:textAppearance">?android:attr/textAppearanceMedium</ item>
48 </style> 48 </style>
49 <style name="PreferenceSummary"> 49 <style name="PreferenceSummary">
50 <item name="android:textAppearance">?android:attr/textAppearanceSmall</i tem> 50 <item name="android:textAppearance">?android:attr/textAppearanceSmall</i tem>
51 <item name="android:textColor">?android:attr/textColorSecondary</item> 51 <item name="android:textColor">?android:attr/textColorSecondary</item>
52 </style> 52 </style>
53 <style name="PreferenceScreenLayout"> 53 <style name="PreferenceScreenLayout">
54 <item name="android:paddingTop">16dp</item>
54 <item name="android:paddingStart">16dp</item> 55 <item name="android:paddingStart">16dp</item>
55 <item name="android:paddingEnd">16dp</item> 56 <item name="android:paddingEnd">16dp</item>
56 </style> 57 </style>
57 <style name="PreferenceLayoutBase"> 58 <style name="PreferenceLayoutBase">
58 <item name="android:background">?android:attr/activatedBackgroundIndicat or</item> 59 <item name="android:background">?android:attr/activatedBackgroundIndicat or</item>
59 <item name="android:minHeight">?android:attr/listPreferredItemHeight</it em> 60 <item name="android:minHeight">?android:attr/listPreferredItemHeight</it em>
60 <item name="android:paddingTop">6dp</item> 61 <item name="android:paddingTop">6dp</item>
61 <item name="android:paddingBottom">6dp</item> 62 <item name="android:paddingBottom">6dp</item>
62 <item name="android:paddingStart">8dp</item> 63 <item name="android:paddingStart">8dp</item>
63 <item name="android:paddingEnd">8dp</item> 64 <item name="android:paddingEnd">8dp</item>
64 </style> 65 </style>
65 <style name="PreferenceLayout" parent="PreferenceLayoutBase" /> 66 <style name="PreferenceLayout" parent="PreferenceLayoutBase" />
66 <style name="DeprecationWarningPreferenceTheme" parent="PreferencesTheme"> 67 <style name="DeprecationWarningPreferenceTheme" parent="PreferencesTheme">
67 <item name="android:textSize">14sp</item> 68 <item name="android:textSize">14sp</item>
68 </style> 69 </style>
70 <style name="PreferenceFloatLabelTextAppearance">
newt (away) 2015/01/27 01:45:05 In PreferencesTheme, you can set PreferenceFloatLa
Theresa 2015/01/28 02:05:40 Done.
71 <item name="android:textColor">@color/float_label</item>
72 <item name="android:textSize">14sp</item>
73 </style>
74 <style name="PreferenceTextFieldLabel" parent="@style/BoldTextFieldLabel">
newt (away) 2015/01/27 01:45:05 When is this style used vs the other? Could you po
Theresa 2015/01/28 02:05:40 It was being used for the labels above the spinner
75 <item name="android:textStyle">normal</item>
76 <item name="android:textColor">@color/secondary_text_default_material_li ght</item>
77 </style>
69 78
70 <style name="ThemeWithActionBar" parent="Theme.AppCompat.Light.DarkActionBar "> 79 <style name="ThemeWithActionBar" parent="Theme.AppCompat.Light.DarkActionBar ">
71 <item name="android:windowBackground">@android:color/white</item> 80 <item name="android:windowBackground">@android:color/white</item>
72 <!-- Action bar color --> 81 <!-- Action bar color -->
73 <item name="colorPrimary">#263238</item> 82 <item name="colorPrimary">#263238</item>
74 <!-- Status bar color --> 83 <!-- Status bar color -->
75 <item name="colorPrimaryDark">#161e21</item> 84 <item name="colorPrimaryDark">#161e21</item>
76 <!-- Color of checkboxes, switches, buttons, etc. --> 85 <!-- Color of checkboxes, switches, buttons, etc. -->
77 <item name="colorAccent">@color/pref_accent_color</item> 86 <item name="colorAccent">@color/pref_accent_color</item>
78 </style> 87 </style>
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 <style name="info_bubble"> 181 <style name="info_bubble">
173 <item name="android:textColor">@android:color/white</item> 182 <item name="android:textColor">@android:color/white</item>
174 <item name="android:textStyle">bold</item> 183 <item name="android:textStyle">bold</item>
175 <item name="android:textSize">18sp</item> 184 <item name="android:textSize">18sp</item>
176 </style> 185 </style>
177 <style name="FullscreenNotificationBubble" parent="@android:style/Animation. Toast"> 186 <style name="FullscreenNotificationBubble" parent="@android:style/Animation. Toast">
178 <item name="android:windowEnterAnimation">@anim/fullscreen_notification_ in</item> 187 <item name="android:windowEnterAnimation">@anim/fullscreen_notification_ in</item>
179 </style> 188 </style>
180 189
181 </resources> 190 </resources>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698