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

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: Minor changes Created 5 years, 10 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>
11 <item name="android:buttonStyle">@style/PreferenceButtonStyle</item> 11 <item name="android:buttonStyle">@style/PreferenceButtonStyle</item>
12 <item name="android:textAppearanceMedium">@style/PreferenceTextAppearanc eMedium</item> 12 <item name="android:textAppearanceMedium">@style/PreferenceTextAppearanc eMedium</item>
13 <item name="android:preferenceCategoryStyle">@style/PreferenceCategory</ item> 13 <item name="android:preferenceCategoryStyle">@style/PreferenceCategory</ item>
14 <item name="floatLabelTextAppearance">@style/PreferenceFloatLabelTextApp earance</item>
14 </style> 15 </style>
15 <style name="PreferenceButtonStyle" parent="@android:style/Widget.Holo.Light .Button"> 16 <style name="PreferenceButtonStyle" parent="@android:style/Widget.Holo.Light .Button">
16 <!-- TODO(twellington): Delete btn_default_preferences.xml once the AppC ompat theme supports 17 <!-- TODO(twellington): Delete btn_default_preferences.xml once the AppC ompat theme supports
17 Material-like buttons. --> 18 Material-like buttons. -->
18 <item name="android:background">@drawable/btn_default_preferences</item> 19 <item name="android:background">@drawable/btn_default_preferences</item>
19 <item name="android:textAllCaps">true</item> 20 <item name="android:textAllCaps">true</item>
20 <item name="android:textColor">#fff</item> 21 <item name="android:textColor">#fff</item>
21 <item name="android:textSize">14sp</item> 22 <item name="android:textSize">14sp</item>
22 <item name="android:textStyle">bold</item> 23 <item name="android:textStyle">bold</item>
23 </style> 24 </style>
(...skipping 20 matching lines...) Expand all
44 <style name="PreferenceTitle"> 45 <style name="PreferenceTitle">
45 <item name="android:ellipsize">end</item> 46 <item name="android:ellipsize">end</item>
46 <item name="android:singleLine">true</item> 47 <item name="android:singleLine">true</item>
47 <item name="android:textAppearance">?android:attr/textAppearanceMedium</ item> 48 <item name="android:textAppearance">?android:attr/textAppearanceMedium</ item>
48 </style> 49 </style>
49 <style name="PreferenceSummary"> 50 <style name="PreferenceSummary">
50 <item name="android:textAppearance">?android:attr/textAppearanceSmall</i tem> 51 <item name="android:textAppearance">?android:attr/textAppearanceSmall</i tem>
51 <item name="android:textColor">?android:attr/textColorSecondary</item> 52 <item name="android:textColor">?android:attr/textColorSecondary</item>
52 </style> 53 </style>
53 <style name="PreferenceScreenLayout"> 54 <style name="PreferenceScreenLayout">
55 <item name="android:paddingTop">16dp</item>
54 <item name="android:paddingStart">16dp</item> 56 <item name="android:paddingStart">16dp</item>
55 <item name="android:paddingEnd">16dp</item> 57 <item name="android:paddingEnd">16dp</item>
56 </style> 58 </style>
57 <style name="PreferenceLayoutBase"> 59 <style name="PreferenceLayoutBase">
58 <item name="android:background">?android:attr/activatedBackgroundIndicat or</item> 60 <item name="android:background">?android:attr/activatedBackgroundIndicat or</item>
59 <item name="android:minHeight">?android:attr/listPreferredItemHeight</it em> 61 <item name="android:minHeight">?android:attr/listPreferredItemHeight</it em>
60 <item name="android:paddingTop">6dp</item> 62 <item name="android:paddingTop">6dp</item>
61 <item name="android:paddingBottom">6dp</item> 63 <item name="android:paddingBottom">6dp</item>
62 <item name="android:paddingStart">8dp</item> 64 <item name="android:paddingStart">8dp</item>
63 <item name="android:paddingEnd">8dp</item> 65 <item name="android:paddingEnd">8dp</item>
64 </style> 66 </style>
65 <style name="PreferenceLayout" parent="PreferenceLayoutBase" /> 67 <style name="PreferenceLayout" parent="PreferenceLayoutBase" />
66 <style name="DeprecationWarningPreferenceTheme" parent="PreferencesTheme"> 68 <style name="DeprecationWarningPreferenceTheme" parent="PreferencesTheme">
67 <item name="android:textSize">14sp</item> 69 <item name="android:textSize">14sp</item>
68 </style> 70 </style>
71 <style name="PreferenceFloatLabelTextAppearance">
72 <item name="android:textColor">@color/float_label</item>
73 <item name="android:textSize">14sp</item>
74 </style>
69 75
70 <style name="ThemeWithActionBar" parent="Theme.AppCompat.Light.DarkActionBar "> 76 <style name="ThemeWithActionBar" parent="Theme.AppCompat.Light.DarkActionBar ">
71 <item name="android:windowBackground">@android:color/white</item> 77 <item name="android:windowBackground">@android:color/white</item>
72 <!-- Action bar color --> 78 <!-- Action bar color -->
73 <item name="colorPrimary">#263238</item> 79 <item name="colorPrimary">#263238</item>
74 <!-- Status bar color --> 80 <!-- Status bar color -->
75 <item name="colorPrimaryDark">#161e21</item> 81 <item name="colorPrimaryDark">#161e21</item>
76 <!-- Color of checkboxes, switches, buttons, etc. --> 82 <!-- Color of checkboxes, switches, buttons, etc. -->
77 <item name="colorAccent">@color/pref_accent_color</item> 83 <item name="colorAccent">@color/pref_accent_color</item>
78 </style> 84 </style>
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 <style name="info_bubble"> 178 <style name="info_bubble">
173 <item name="android:textColor">@android:color/white</item> 179 <item name="android:textColor">@android:color/white</item>
174 <item name="android:textStyle">bold</item> 180 <item name="android:textStyle">bold</item>
175 <item name="android:textSize">18sp</item> 181 <item name="android:textSize">18sp</item>
176 </style> 182 </style>
177 <style name="FullscreenNotificationBubble" parent="@android:style/Animation. Toast"> 183 <style name="FullscreenNotificationBubble" parent="@android:style/Animation. Toast">
178 <item name="android:windowEnterAnimation">@anim/fullscreen_notification_ in</item> 184 <item name="android:windowEnterAnimation">@anim/fullscreen_notification_ in</item>
179 </style> 185 </style>
180 186
181 </resources> 187 </resources>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698