chrome/android/java/res/values-v17/styles.xml - Issue 1235033003: Move ButtonCompat to ui/android/

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

Issue 1235033003: Move ButtonCompat to ui/android/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove buttonColor from chrome/android/. 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/layout/sad_tab.xml ('k') | chrome/android/java/res/values/attrs.xml » ('j') | ui/android/java/res/drawable-v21/button_borderless_compat.xml » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 213 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
224 </style>	224 </style>

225 <style name="info_bubble">	225 <style name="info_bubble">

226 <item name="android:textColor">@android:color/white</item>	226 <item name="android:textColor">@android:color/white</item>

227 <item name="android:textStyle">bold</item>	227 <item name="android:textStyle">bold</item>

228 <item name="android:textSize">18sp</item>	228 <item name="android:textSize">18sp</item>

229 </style>	229 </style>

230 <style name="FullscreenNotificationBubble" parent="@android:style/Animation. Toast">	230 <style name="FullscreenNotificationBubble" parent="@android:style/Animation. Toast">

231 <item name="android:windowEnterAnimation">@anim/fullscreen_notification_ in</item>	231 <item name="android:windowEnterAnimation">@anim/fullscreen_notification_ in</item>

232 </style>	232 </style>

233	233

234 <!-- Buttons -->

235 <style name="ButtonCompatOverlay">

236 <item name="android:buttonStyle">@style/ButtonCompat</item>

237 </style>

238 <style name="ButtonCompatBorderlessOverlay">

239 <item name="android:buttonStyle">@style/ButtonCompatBorderless</item>

240 </style>

241 <style name="ButtonCompatBase">

242 <item name="android:minWidth">88dp</item>

243 <item name="android:minHeight">36dp</item>

244 <item name="android:textSize">14sp</item>

245 <item name="android:paddingStart">20dp</item>

246 <item name="android:paddingEnd">20dp</item>

247 <item name="android:paddingTop">5dp</item>

248 <item name="android:paddingBottom">5dp</item>

249 <item name="android:textAllCaps">true</item>

250 <item name="android:focusable">true</item>

251 <item name="android:clickable">true</item>

252 <item name="android:gravity">center_vertical\|center_horizontal</item>

253 </style>

254 <style name="ButtonCompat" parent="ButtonCompatBase">

255 <item name="android:background">@drawable/button_compat_shape</item>

256 <item name="android:textStyle">bold</item>

257 </style>

258 <style name="ButtonCompatBorderless" parent="ButtonCompat">

259 <item name="android:background">?attr/selectableItemBackground</item>

260 </style>

261

262 <!-- Data Saver -->	234 <!-- Data Saver -->

263 <style name="DataReductionPromoScreenDialog" >	235 <style name="DataReductionPromoScreenDialog" >

264 <item name="android:background">@android:color/transparent</item>	236 <item name="android:background">@android:color/transparent</item>

265 <item name="android:backgroundDimEnabled">false</item>	237 <item name="android:backgroundDimEnabled">false</item>

266 <item name="android:clipChildren">false</item>	238 <item name="android:clipChildren">false</item>

267 <item name="android:clipToPadding">false</item>	239 <item name="android:clipToPadding">false</item>

268 <item name="android:windowAnimationStyle">@null</item>	240 <item name="android:windowAnimationStyle">@null</item>

269 <item name="android:windowBackground">@android:color/transparent</item>	241 <item name="android:windowBackground">@android:color/transparent</item>

270 <item name="android:windowCloseOnTouchOutside">false</item>	242 <item name="android:windowCloseOnTouchOutside">false</item>

271 <item name="android:windowContentOverlay">@null</item>	243 <item name="android:windowContentOverlay">@null</item>

(...skipping 122 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
394 <style name="LocationBarButton">	366 <style name="LocationBarButton">

395 <item name="android:background">@null</item>	367 <item name="android:background">@null</item>

396 </style>	368 </style>

397 <style name="ToolbarButton">	369 <style name="ToolbarButton">

398 <item name="android:background">?attr/selectableItemBackground</item>	370 <item name="android:background">?attr/selectableItemBackground</item>

399 <item name="android:layout_width">48dp</item>	371 <item name="android:layout_width">48dp</item>

400 <item name="android:layout_height">56dp</item>	372 <item name="android:layout_height">56dp</item>

401 <item name="android:scaleType">center</item>	373 <item name="android:scaleType">center</item>

402 </style>	374 </style>

403 </resources>	375 </resources>

OLD	NEW