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

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

Issue 1235033003: Move ButtonCompat to ui/android/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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/values-v17/styles.xml ('k') | chrome/android/java/res/values/attrs.xml » ('j') | 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>
(...skipping 27 matching lines...) Expand all
38 <style name="PreferenceLayoutBase"> 38 <style name="PreferenceLayoutBase">
39 <item name="android:background">?android:attr/activatedBackgroundIndicat or</item> 39 <item name="android:background">?android:attr/activatedBackgroundIndicat or</item>
40 <item name="android:minHeight">?android:attr/listPreferredItemHeightSmal l</item> 40 <item name="android:minHeight">?android:attr/listPreferredItemHeightSmal l</item>
41 <item name="android:paddingTop">16dp</item> 41 <item name="android:paddingTop">16dp</item>
42 <item name="android:paddingBottom">16dp</item> 42 <item name="android:paddingBottom">16dp</item>
43 <item name="android:paddingStart">?android:attr/listPreferredItemPadding Start</item> 43 <item name="android:paddingStart">?android:attr/listPreferredItemPadding Start</item>
44 <item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEn d</item> 44 <item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEn d</item>
45 </style> 45 </style>
46 <style name="PreferenceLayout" parent="PreferenceLayoutBase" /> 46 <style name="PreferenceLayout" parent="PreferenceLayoutBase" />
47 47
48 <!-- Buttons -->
49 <style name="ButtonCompat" parent="ButtonCompatBase">
50 <item name="android:background">@drawable/button_compat</item>
51 <item name="android:fontFamily">sans-serif-medium</item>
52 </style>
53 <style name="ButtonCompatBorderless" parent="ButtonCompat">
54 <item name="android:background">@drawable/button_borderless_compat</item >
55 </style>
56 <!-- Cast and media playback notifications --> 48 <!-- Cast and media playback notifications -->
57 <style name="MediaNotificationTitle" 49 <style name="MediaNotificationTitle"
58 parent="@android:style/TextAppearance.Material.Notification.Title"> 50 parent="@android:style/TextAppearance.Material.Notification.Title">
59 </style> 51 </style>
60 <style name="MediaNotificationText" 52 <style name="MediaNotificationText"
61 parent="@android:style/TextAppearance.Material.Notification"/> 53 parent="@android:style/TextAppearance.Material.Notification"/>
62 <style name="RemoteNotificationTitle" 54 <style name="RemoteNotificationTitle"
63 parent="@android:style/TextAppearance.Material.Notification.Title"> 55 parent="@android:style/TextAppearance.Material.Notification.Title">
64 <item name="android:layout_marginBottom">4dp</item> 56 <item name="android:layout_marginBottom">4dp</item>
65 </style> 57 </style>
66 <style name="RemoteNotificationText" 58 <style name="RemoteNotificationText"
67 parent="@android:style/TextAppearance.Material.Notification.Line2"/> 59 parent="@android:style/TextAppearance.Material.Notification.Line2"/>
68 <style name="RemoteNotificationProgressBar" parent="@android:style/Widget.Pr ogressBar.Horizontal"> 60 <style name="RemoteNotificationProgressBar" parent="@android:style/Widget.Pr ogressBar.Horizontal">
69 <item name="android:minHeight">5dp</item> 61 <item name="android:minHeight">5dp</item>
70 </style> 62 </style>
71 63
72 <style name="IncognitoTheme" parent="MainTheme"> 64 <style name="IncognitoTheme" parent="MainTheme">
73 <item name="android:colorPrimary">@color/incognito_primary_color</item> 65 <item name="android:colorPrimary">@color/incognito_primary_color</item>
74 </style> 66 </style>
75 67
76 </resources> 68 </resources>
OLDNEW
« no previous file with comments | « chrome/android/java/res/values-v17/styles.xml ('k') | chrome/android/java/res/values/attrs.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698