Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: mobile/android/base/resources/values/styles.xml

Issue 29348083: Issue 3769 - UI colours gone bad (Closed)
Left Patch Set: Created July 21, 2016, 2:09 a.m.
Right Patch Set: Adjusting comments which indicates what has being changed by this issue in upstream code Created Oct. 25, 2016, 12:16 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « mobile/android/base/resources/values/dimens.xml ('k') | mobile/android/base/resources/values/themes.xml » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- This Source Code Form is subject to the terms of the Mozilla Public 2 <!-- This Source Code Form is subject to the terms of the Mozilla Public
3 - License, v. 2.0. If a copy of the MPL was not distributed with this 3 - License, v. 2.0. If a copy of the MPL was not distributed with this
4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> 4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
5 5
6 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tool s="http://schemas.android.com/tools"> 6 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tool s="http://schemas.android.com/tools">
7
8 <!-- Using ABB color palette in some styles. See https://issues.adblockplus. org/ticket/3769 -->
9 7
10 <!-- 8 <!--
11 Base application styles. This could be overridden in other res/values-XX X/themes.xml. 9 Base application styles. This could be overridden in other res/values-XX X/themes.xml.
12 --> 10 -->
13 <style name="Widget"/> 11 <style name="Widget"/>
14 12
15 <style name="Widget.BaseButton" parent="android:style/Widget.Button"/> 13 <style name="Widget.BaseButton" parent="android:style/Widget.Button"/>
16 14
17 <style name="Widget.BaseDropDownItem" parent="android:style/Widget.DropDownI tem"/> 15 <style name="Widget.BaseDropDownItem" parent="android:style/Widget.DropDownI tem"/>
18 16
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 <style name="TextAppearance.Small.Inverse"> 359 <style name="TextAppearance.Small.Inverse">
362 <item name="android:textColor">?android:attr/textColorSecondaryInverse</ item> 360 <item name="android:textColor">?android:attr/textColorSecondaryInverse</ item>
363 <item name="android:textColorHint">?android:attr/textColorHintInverse</i tem> 361 <item name="android:textColorHint">?android:attr/textColorHintInverse</i tem>
364 <item name="android:textColorHighlight">@color/text_color_highlight_inve rse</item> 362 <item name="android:textColorHighlight">@color/text_color_highlight_inve rse</item>
365 <item name="android:textColorLink">?android:attr/textColorLink</item> 363 <item name="android:textColorLink">?android:attr/textColorLink</item>
366 </style> 364 </style>
367 365
368 <style name="TextAppearance.EmptyMessage" parent="TextAppearance.Large"/> 366 <style name="TextAppearance.EmptyMessage" parent="TextAppearance.Large"/>
369 367
370 <style name="TextAppearance.EmptyHint" parent="TextAppearance.Medium"> 368 <style name="TextAppearance.EmptyHint" parent="TextAppearance.Medium">
369 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/ 3769 -->
371 <item name="android:textColor">@color/abb_accent_dark_blue</item> 370 <item name="android:textColor">@color/abb_accent_dark_blue</item>
372 </style> 371 </style>
373 372
374 <style name="TextAppearance.Micro"> 373 <style name="TextAppearance.Micro">
375 <item name="android:textSize">12sp</item> 374 <item name="android:textSize">12sp</item>
376 <item name="android:textColor">?android:attr/textColorTertiary</item> 375 <item name="android:textColor">?android:attr/textColorTertiary</item>
377 </style> 376 </style>
378 377
379 <style name="TextAppearance.Micro.Inverse"> 378 <style name="TextAppearance.Micro.Inverse">
380 <item name="android:textColor">?android:attr/textColorTertiaryInverse</i tem> 379 <item name="android:textColor">?android:attr/textColorTertiaryInverse</i tem>
(...skipping 27 matching lines...) Expand all
408 407
409 <style name="TextAppearance.Widget.Home" /> 408 <style name="TextAppearance.Widget.Home" />
410 409
411 <style name="TextAppearance.Widget.Home.Header" parent="TextAppearance.Small "> 410 <style name="TextAppearance.Widget.Home.Header" parent="TextAppearance.Small ">
412 <item name="android:textColor">?android:attr/textColorPrimary</item> 411 <item name="android:textColor">?android:attr/textColorPrimary</item>
413 </style> 412 </style>
414 413
415 <style name="TextAppearance.Widget.Home.ItemTitle" parent="TextAppearance.Me dium"/> 414 <style name="TextAppearance.Widget.Home.ItemTitle" parent="TextAppearance.Me dium"/>
416 415
417 <style name="TextAppearance.Widget.Home.ItemDescription" parent="TextAppeara nce.Micro"> 416 <style name="TextAppearance.Widget.Home.ItemDescription" parent="TextAppeara nce.Micro">
417 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/ 3769 -->
418 <item name="android:textColor">@color/abb_text_divider_grey</item> 418 <item name="android:textColor">@color/abb_text_divider_grey</item>
419 </style> 419 </style>
420 420
421 <style name="TextAppearance.Widget.HomeBanner" parent="TextAppearance.Small" > 421 <style name="TextAppearance.Widget.HomeBanner" parent="TextAppearance.Small" >
422 <item name="android:textColor">?android:attr/textColorHint</item> 422 <item name="android:textColor">?android:attr/textColorHint</item>
423 </style> 423 </style>
424 424
425 <style name="TextAppearance.DoorHanger"> 425 <style name="TextAppearance.DoorHanger">
426 <item name="android:textColor">@color/placeholder_active_grey</item> 426 <item name="android:textColor">@color/placeholder_active_grey</item>
427 <item name="android:textColorLink">@color/doorhanger_link</item> 427 <item name="android:textColorLink">@color/doorhanger_link</item>
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 580
581 <!-- TabWidget --> 581 <!-- TabWidget -->
582 <style name="TabWidget"> 582 <style name="TabWidget">
583 <item name="android:layout_width">wrap_content</item> 583 <item name="android:layout_width">wrap_content</item>
584 <item name="android:layout_height">40dip</item> 584 <item name="android:layout_height">40dip</item>
585 <item name="android:layout_weight">1.0</item> 585 <item name="android:layout_weight">1.0</item>
586 </style> 586 </style>
587 587
588 <!-- Find bar --> 588 <!-- Find bar -->
589 <style name="FindBar"> 589 <style name="FindBar">
590 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/ 3769 -->
590 <item name="android:background">@color/abb_background_light_grey</item> 591 <item name="android:background">@color/abb_background_light_grey</item>
591 <item name="android:paddingLeft">3dip</item> 592 <item name="android:paddingLeft">3dip</item>
592 <item name="android:paddingRight">3dip</item> 593 <item name="android:paddingRight">3dip</item>
593 <item name="android:paddingTop">6dip</item> 594 <item name="android:paddingTop">6dip</item>
594 <item name="android:paddingBottom">6dip</item> 595 <item name="android:paddingBottom">6dip</item>
595 </style> 596 </style>
596 597
597 <!-- Find bar - Image Button --> 598 <!-- Find bar - Image Button -->
598 <style name="FindBar.ImageButton"> 599 <style name="FindBar.ImageButton">
599 <item name="android:layout_width">wrap_content</item> 600 <item name="android:layout_width">wrap_content</item>
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 <item name="android:textSize">20sp</item> 841 <item name="android:textSize">20sp</item>
841 <item name="android:gravity">center</item> 842 <item name="android:gravity">center</item>
842 <item name="android:paddingTop">16dp</item> 843 <item name="android:paddingTop">16dp</item>
843 <item name="android:paddingBottom">16dp</item> 844 <item name="android:paddingBottom">16dp</item>
844 <item name="android:paddingLeft">8dp</item> 845 <item name="android:paddingLeft">8dp</item>
845 <item name="android:paddingRight">8dp</item> 846 <item name="android:paddingRight">8dp</item>
846 </style> 847 </style>
847 848
848 <style name="TabQueueActivity" parent="android:style/Theme.NoDisplay" /> 849 <style name="TabQueueActivity" parent="android:style/Theme.NoDisplay" />
849 </resources> 850 </resources>
LEFTRIGHT

Powered by Google App Engine
This is Rietveld