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

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

Issue 2113493002: [Payments] Switch to using TextInputLayouts, update statusbar color (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments Created 4 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
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 xmlns:tools="http://schemas.android.com/tools"> 6 <resources xmlns:tools="http://schemas.android.com/tools">
7 <!-- Q: Why put style resources under values-v17/ ? 7 <!-- Q: Why put style resources under values-v17/ ?
8 A: Problem: 8 A: Problem:
9 1. paddingStart causes a crash on Galaxy Tab&Note b/8351339. 9 1. paddingStart causes a crash on Galaxy Tab&Note b/8351339.
10 2. So we wrote a build script(generate_v14_compatible_resources.py) to convert 10 2. So we wrote a build script(generate_v14_compatible_resources.py) to convert
(...skipping 28 matching lines...) Expand all
39 <item name="android:windowSharedElementExitTransition" tools:targetApi=" 21">@transition/move_image</item> 39 <item name="android:windowSharedElementExitTransition" tools:targetApi=" 21">@transition/move_image</item>
40 </style> 40 </style>
41 41
42 <style name="TabbedModeTheme" parent="MainTheme"> 42 <style name="TabbedModeTheme" parent="MainTheme">
43 <item name="android:windowBackground">@drawable/window_background</item> 43 <item name="android:windowBackground">@drawable/window_background</item>
44 </style> 44 </style>
45 45
46 <style name="FullscreenWhiteDialog" parent="Theme.AppCompat.Light" > 46 <style name="FullscreenWhiteDialog" parent="Theme.AppCompat.Light" >
47 <item name="android:windowBackground">@android:color/white</item> 47 <item name="android:windowBackground">@android:color/white</item>
48 <item name="android:textColorLink">@color/light_active_color</item> 48 <item name="android:textColorLink">@color/light_active_color</item>
49 <item name="android:statusBarColor" tools:targetApi="21">@android:color/ black</item>
49 <item name="colorPrimary">@color/light_active_color</item> 50 <item name="colorPrimary">@color/light_active_color</item>
50 <item name="colorAccent">@color/light_active_color</item> 51 <item name="colorAccent">@color/light_active_color</item>
51 </style> 52 </style>
52 53
53 <!-- Web app themes --> 54 <!-- Web app themes -->
54 <style name="WebappTheme" parent="MainTheme"> 55 <style name="WebappTheme" parent="MainTheme">
55 <item name="android:windowBackground">@null</item> 56 <item name="android:windowBackground">@null</item>
56 <item name="android:windowDisablePreview">true</item> 57 <item name="android:windowDisablePreview">true</item>
57 </style> 58 </style>
58 <style name="WebappSplashScreenTextTheme"> 59 <style name="WebappSplashScreenTextTheme">
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 <item name="android:ellipsize">end</item> 118 <item name="android:ellipsize">end</item>
118 <item name="android:singleLine">true</item> 119 <item name="android:singleLine">true</item>
119 <item name="android:textAppearance">?android:attr/textAppearanceMedium</ item> 120 <item name="android:textAppearance">?android:attr/textAppearanceMedium</ item>
120 </style> 121 </style>
121 <style name="PreferenceSummary"> 122 <style name="PreferenceSummary">
122 <item name="android:textAppearance">?android:attr/textAppearanceSmall</i tem> 123 <item name="android:textAppearance">?android:attr/textAppearanceSmall</i tem>
123 <item name="android:textColor">?android:attr/textColorSecondary</item> 124 <item name="android:textColor">?android:attr/textColorSecondary</item>
124 </style> 125 </style>
125 <style name="PreferenceScreenLayout"> 126 <style name="PreferenceScreenLayout">
126 <item name="android:paddingTop">16dp</item> 127 <item name="android:paddingTop">16dp</item>
127 <item name="android:paddingStart">16dp</item> 128
128 <item name="android:paddingEnd">16dp</item> 129 <!-- Additional padding is applied to each of the controls inside the la yout, making this
130 a 16dp padding overall. -->
131 <item name="android:paddingStart">@dimen/pref_autofill_content_padding</ item>
132 <item name="android:paddingEnd">@dimen/pref_autofill_content_padding</it em>
129 </style> 133 </style>
130 <style name="PreferenceLayoutBase"> 134 <style name="PreferenceLayoutBase">
131 <item name="android:background">?android:attr/activatedBackgroundIndicat or</item> 135 <item name="android:background">?android:attr/activatedBackgroundIndicat or</item>
132 <item name="android:minHeight">?android:attr/listPreferredItemHeight</it em> 136 <item name="android:minHeight">?android:attr/listPreferredItemHeight</it em>
133 <item name="android:paddingTop">6dp</item> 137 <item name="android:paddingTop">6dp</item>
134 <item name="android:paddingBottom">6dp</item> 138 <item name="android:paddingBottom">6dp</item>
135 <item name="android:paddingStart">8dp</item> 139 <item name="android:paddingStart">8dp</item>
136 <item name="android:paddingEnd">8dp</item> 140 <item name="android:paddingEnd">8dp</item>
137 </style> 141 </style>
138 <style name="PreferenceLayout" parent="PreferenceLayoutBase" /> 142 <style name="PreferenceLayout" parent="PreferenceLayoutBase" />
139 <style name="DeprecationWarningPreferenceTheme" parent="PreferencesTheme"> 143 <style name="DeprecationWarningPreferenceTheme" parent="PreferencesTheme">
140 <item name="android:textSize">14sp</item> 144 <item name="android:textSize">14sp</item>
141 </style> 145 </style>
142 <style name="PreferenceFloatLabelTextAppearance"> 146 <style name="PreferenceFloatLabelTextAppearance">
143 <item name="android:textColor">@color/float_label</item> 147 <item name="android:textColor">@color/descriptive_text_color</item>
144 <item name="android:textSize">14sp</item> 148 <item name="android:textSize">12sp</item>
145 </style> 149 </style>
146 <style name="PreferenceSpinnerItem"> 150 <style name="PreferenceSpinnerItem">
147 <item name="android:textAppearance">@style/PreferenceTextAppearanceMediu m</item> 151 <item name="android:textAppearance">@style/PreferenceTextAppearanceMediu m</item>
148 </style> 152 </style>
149 <style name="PreferenceSpinnerUnderlineView"> 153 <style name="PreferenceSpinnerUnderlineView">
150 <item name="android:layout_width">match_parent</item> 154 <item name="android:layout_width">match_parent</item>
151 <item name="android:layout_height">1dp</item> 155 <item name="android:layout_height">1dp</item>
152 <item name="android:layout_marginTop">2dp</item> 156 <item name="android:layout_marginTop">2dp</item>
153 <item name="android:background">@color/input_underline_color</item> 157 <item name="android:background">@color/google_grey_600</item>
154 </style> 158 </style>
155 159
156 <style name="ThemeWithActionBar" parent="Theme.AppCompat.Light.DarkActionBar "> 160 <style name="ThemeWithActionBar" parent="Theme.AppCompat.Light.DarkActionBar ">
157 <item name="android:windowBackground">@drawable/action_bar_activity_bg</ item> 161 <item name="android:windowBackground">@drawable/action_bar_activity_bg</ item>
158 <!-- Action bar color --> 162 <!-- Action bar color -->
159 <item name="colorPrimary">@color/dark_action_bar_color</item> 163 <item name="colorPrimary">@color/dark_action_bar_color</item>
160 <!-- Status bar color --> 164 <!-- Status bar color -->
161 <item name="colorPrimaryDark">#161e21</item> 165 <item name="colorPrimaryDark">#161e21</item>
162 <!-- Color of checkboxes, switches, buttons, etc. --> 166 <!-- Color of checkboxes, switches, buttons, etc. -->
163 <item name="colorAccent">@color/pref_accent_color</item> 167 <item name="colorAccent">@color/pref_accent_color</item>
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 <style name="ToolbarMenuButtonTablet" parent="ToolbarButton"> 542 <style name="ToolbarMenuButtonTablet" parent="ToolbarButton">
539 <item name="android:layout_width">43dp</item> 543 <item name="android:layout_width">43dp</item>
540 <item name="android:paddingEnd">3.5dp</item> 544 <item name="android:paddingEnd">3.5dp</item>
541 </style> 545 </style>
542 <style name="AppMenuItem"> 546 <style name="AppMenuItem">
543 <item name="android:paddingStart">16dp</item> 547 <item name="android:paddingStart">16dp</item>
544 <item name="android:paddingEnd">16dp</item> 548 <item name="android:paddingEnd">16dp</item>
545 <item name="android:background">?attr/listChoiceBackgroundIndicator</ite m> 549 <item name="android:background">?attr/listChoiceBackgroundIndicator</ite m>
546 </style> 550 </style>
547 </resources> 551 </resources>
OLDNEW
« no previous file with comments | « chrome/android/java/res/layout/preference_address_float_label_layout.xml ('k') | chrome/android/java/res/values/colors.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698