Side by Side Diff: mobile/android/base/resources/values-v21/themes.xml
Issue 29348083:
Issue 3769 - UI colours gone bad (Closed)
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.
« no previous file with comments
|
« mobile/android/base/resources/values-v21/styles.xml ('k')
|
mobile/android/base/resources/values/abb_colors.xml » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
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 <!-- 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> | 6 <resources> |
| 7 | 7 |
| 8 <!-- | 8 <!-- |
| 9 Base application theme. | 9 Base application theme. |
| 10 --> | 10 --> |
| 11 <style name="GeckoBase" parent="@android:style/Theme.Material.Light"> | 11 <style name="GeckoBase" parent="Theme.AppCompat.Light"> |
| 12 <item name="android:colorPrimary">@color/text_and_tabs_tray_grey</item> | 12 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/ 3769 --> |
| 13 <item name="android:colorPrimaryDark">@color/placeholder_active_grey</it em> | 13 <item name="colorPrimary">@color/abb_background_light_grey</item> |
| 14 <item name="colorPrimaryDark">@color/placeholder_active_grey</item> | |
| 14 <item name="windowActionBar">false</item> | 15 <item name="windowActionBar">false</item> |
| 15 <item name="android:windowNoTitle">true</item> | 16 <item name="windowNoTitle">true</item> |
| 16 <item name="android:windowContentOverlay">@null</item> | 17 <item name="android:windowContentOverlay">@null</item> |
| 17 <item name="android:actionBarStyle">@style/GeckoActionBar</item> | 18 <item name="android:actionBarStyle">@style/GeckoActionBar</item> |
| 18 <item name="android:actionBarTheme">@style/ActionBarTheme</item> | 19 <item name="android:actionBarTheme">@style/ActionBarTheme</item> |
| 19 <!-- TODO (bug 1220863): Once we extend AppCompatActivity, set actionBar Style. --> | 20 <!-- TODO (bug 1220863): Once we extend AppCompatActivity, set actionBar Style. --> |
| 20 <item name="android:alertDialogTheme">@style/GeckoAlertDialog</item> | 21 <item name="android:alertDialogTheme">@style/GeckoAlertDialog</item> |
| 21 </style> | 22 </style> |
| 22 | 23 |
| 23 <style name="GeckoPreferencesBase" parent="Gecko"> | 24 <style name="GeckoPreferencesBase" parent="Gecko"> |
| 24 <item name="android:windowActionBar">true</item> | 25 <item name="android:windowActionBar">true</item> |
| 25 <item name="android:windowNoTitle">false</item> | 26 <item name="android:windowNoTitle">false</item> |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 45 <item name="android:panelBackground">@drawable/menu_panel_bg</item> | 46 <item name="android:panelBackground">@drawable/menu_panel_bg</item> |
| 46 <item name="android:spinnerDropDownItemStyle">@style/Widget.DropDownItem .Spinner</item> | 47 <item name="android:spinnerDropDownItemStyle">@style/Widget.DropDownItem .Spinner</item> |
| 47 <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem </item> | 48 <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem </item> |
| 48 <item name="menuItemActionViewStyle">@style/Widget.MenuItemActionView</i tem> | 49 <item name="menuItemActionViewStyle">@style/Widget.MenuItemActionView</i tem> |
| 49 <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item> | 50 <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item> |
| 50 <item name="menuItemSecondaryActionBarStyle">@style/Widget.MenuItemSecon daryActionBar</item> | 51 <item name="menuItemSecondaryActionBarStyle">@style/Widget.MenuItemSecon daryActionBar</item> |
| 51 <item name="tabGridLayoutViewStyle">@style/Widget.TabsGridLayout</item> | 52 <item name="tabGridLayoutViewStyle">@style/Widget.TabsGridLayout</item> |
| 52 </style> | 53 </style> |
| 53 | 54 |
| 54 </resources> | 55 </resources> |
| OLD | NEW |
« no previous file with comments
|
« mobile/android/base/resources/values-v21/styles.xml ('k')
|
mobile/android/base/resources/values/abb_colors.xml » ('j')
|
no next file with comments »
