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

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

Issue 2646313005: Implement additional parts of the new ui for CBD. (Closed)
Patch Set: remove linearlayout Created 3 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 <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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 <item name="android:ellipsize">end</item> 126 <item name="android:ellipsize">end</item>
127 <item name="android:singleLine">true</item> 127 <item name="android:singleLine">true</item>
128 <item name="android:textAppearance">?android:attr/textAppearanceMedium</ item> 128 <item name="android:textAppearance">?android:attr/textAppearanceMedium</ item>
129 </style> 129 </style>
130 <style name="PreferenceSummary"> 130 <style name="PreferenceSummary">
131 <item name="android:textAppearance">?android:attr/textAppearanceSmall</i tem> 131 <item name="android:textAppearance">?android:attr/textAppearanceSmall</i tem>
132 <item name="android:textColor">?android:attr/textColorSecondary</item> 132 <item name="android:textColor">?android:attr/textColorSecondary</item>
133 </style> 133 </style>
134 <style name="PreferenceScreenLayout"> 134 <style name="PreferenceScreenLayout">
135 <item name="android:paddingTop">16dp</item> 135 <item name="android:paddingTop">16dp</item>
136 136
137 <!-- Additional padding is applied to each of the controls inside the la yout, making this 137 <!-- Additional padding is applied to each of the controls inside the la yout, making this
138 a 16dp padding overall. --> 138 a 16dp padding overall. -->
139 <item name="android:paddingStart">@dimen/pref_autofill_content_spacing</ item> 139 <item name="android:paddingStart">@dimen/pref_autofill_content_spacing</ item>
140 <item name="android:paddingEnd">@dimen/pref_autofill_content_spacing</it em> 140 <item name="android:paddingEnd">@dimen/pref_autofill_content_spacing</it em>
141 </style> 141 </style>
142 <style name="PreferenceLayoutBase"> 142 <style name="PreferenceLayoutBase">
143 <item name="android:background">?android:attr/activatedBackgroundIndicat or</item> 143 <item name="android:background">?android:attr/activatedBackgroundIndicat or</item>
144 <item name="android:minHeight">?android:attr/listPreferredItemHeight</it em> 144 <item name="android:minHeight">?android:attr/listPreferredItemHeight</it em>
145 <item name="android:paddingTop">6dp</item> 145 <item name="android:paddingTop">6dp</item>
146 <item name="android:paddingBottom">6dp</item> 146 <item name="android:paddingBottom">6dp</item>
(...skipping 10 matching lines...) Expand all
157 </style> 157 </style>
158 <style name="PreferenceSpinnerItem"> 158 <style name="PreferenceSpinnerItem">
159 <item name="android:textAppearance">@style/PreferenceTextAppearanceMediu m</item> 159 <item name="android:textAppearance">@style/PreferenceTextAppearanceMediu m</item>
160 </style> 160 </style>
161 <style name="PreferenceSpinnerUnderlineView"> 161 <style name="PreferenceSpinnerUnderlineView">
162 <item name="android:layout_width">match_parent</item> 162 <item name="android:layout_width">match_parent</item>
163 <item name="android:layout_height">1dp</item> 163 <item name="android:layout_height">1dp</item>
164 <item name="android:layout_marginTop">2dp</item> 164 <item name="android:layout_marginTop">2dp</item>
165 <item name="android:background">@color/google_grey_600</item> 165 <item name="android:background">@color/google_grey_600</item>
166 </style> 166 </style>
167 <style name="Divider">
168 <item name="android:layout_width">match_parent</item>
169 <item name="android:layout_height">1dp</item>
170 <item name="android:background">@color/google_grey_300</item>
171 </style>
167 172
168 <style name="ThemeWithActionBar" parent="Theme.AppCompat.Light.DarkActionBar "> 173 <style name="ThemeWithActionBar" parent="Theme.AppCompat.Light.DarkActionBar ">
169 <item name="android:windowBackground">@drawable/action_bar_activity_bg</ item> 174 <item name="android:windowBackground">@drawable/action_bar_activity_bg</ item>
170 <!-- Action bar color --> 175 <!-- Action bar color -->
171 <item name="colorPrimary">@color/dark_action_bar_color</item> 176 <item name="colorPrimary">@color/dark_action_bar_color</item>
172 <!-- Status bar color --> 177 <!-- Status bar color -->
173 <item name="colorPrimaryDark">#161e21</item> 178 <item name="colorPrimaryDark">#161e21</item>
174 <!-- Color of checkboxes, switches, buttons, etc. --> 179 <!-- Color of checkboxes, switches, buttons, etc. -->
175 <item name="colorAccent">@color/pref_accent_color</item> 180 <item name="colorAccent">@color/pref_accent_color</item>
176 </style> 181 </style>
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 name="RemoteNotificationProgressBar" 327 name="RemoteNotificationProgressBar"
323 parent="@android:style/Widget.Holo.ProgressBar.Horizontal"/> 328 parent="@android:style/Widget.Holo.ProgressBar.Horizontal"/>
324 <style name="CastMediaRouteButton" parent="@style/Widget.MediaRouter.MediaRo uteButton"> 329 <style name="CastMediaRouteButton" parent="@style/Widget.MediaRouter.MediaRo uteButton">
325 <item name="android:background">@null</item> 330 <item name="android:background">@null</item>
326 <item name="android:paddingTop">0dp</item> 331 <item name="android:paddingTop">0dp</item>
327 <item name="android:paddingBottom">0dp</item> 332 <item name="android:paddingBottom">0dp</item>
328 <item name="android:paddingStart">0dp</item> 333 <item name="android:paddingStart">0dp</item>
329 <item name="android:paddingEnd">0dp</item> 334 <item name="android:paddingEnd">0dp</item>
330 <item name="externalRouteEnabledDrawable">@drawable/ic_cast_dark_chrome< /item> 335 <item name="externalRouteEnabledDrawable">@drawable/ic_cast_dark_chrome< /item>
331 </style> 336 </style>
332 337
333 <!-- First Run Experience --> 338 <!-- First Run Experience -->
334 <style name="FreTitle"> 339 <style name="FreTitle">
335 <item name="android:layout_width">wrap_content</item> 340 <item name="android:layout_width">wrap_content</item>
336 <item name="android:layout_height">wrap_content</item> 341 <item name="android:layout_height">wrap_content</item>
337 <item name="android:gravity">center</item> 342 <item name="android:gravity">center</item>
338 <item name="android:lineSpacingMultiplier">1.4</item> 343 <item name="android:lineSpacingMultiplier">1.4</item>
339 <item name="android:textColor">@color/fre_title_color</item> 344 <item name="android:textColor">@color/fre_title_color</item>
340 <item name="android:textSize">@dimen/fre_title_text_size</item> 345 <item name="android:textSize">@dimen/fre_title_text_size</item>
341 </style> 346 </style>
342 347
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 <item name="android:layout_width">wrap_content</item> 612 <item name="android:layout_width">wrap_content</item>
608 <item name="android:layout_height">wrap_content</item> 613 <item name="android:layout_height">wrap_content</item>
609 <item name="android:layout_marginTop">0dp</item> 614 <item name="android:layout_marginTop">0dp</item>
610 <item name="android:minHeight">18dp</item> 615 <item name="android:minHeight">18dp</item>
611 <item name="android:textColor">@color/google_grey_600</item> 616 <item name="android:textColor">@color/google_grey_600</item>
612 <item name="android:textSize">12sp</item>1 617 <item name="android:textSize">12sp</item>1
613 <item name="android:ellipsize">start</item> 618 <item name="android:ellipsize">start</item>
614 <item name="android:singleLine">true</item> 619 <item name="android:singleLine">true</item>
615 </style> 620 </style>
616 </resources> 621 </resources>
OLDNEW
« no previous file with comments | « chrome/android/java/res/layout/preference_spinner_single_line.xml ('k') | chrome/android/java/res/values/attrs.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698