Left: | ||
Right: |
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 <item name="android:colorPrimary">@color/text_and_tabs_tray_grey</item> |
13 <item name="android:colorPrimaryDark">@color/placeholder_active_grey</it em> | 13 <item name="android:colorPrimaryDark">@color/placeholder_active_grey</it em> |
14 <item name="windowActionBar">false</item> | 14 <item name="windowActionBar">false</item> |
15 <item name="android:windowNoTitle">true</item> | 15 <item name="android:windowNoTitle">true</item> |
16 <item name="android:windowContentOverlay">@null</item> | 16 <item name="android:windowContentOverlay">@null</item> |
17 <item name="android:actionBarStyle">@style/GeckoActionBar</item> | 17 <item name="android:actionBarStyle">@style/GeckoActionBar</item> |
18 <item name="android:actionBarTheme">@style/ActionBarTheme</item> | 18 <item name="android:actionBarTheme">@style/ActionBarTheme</item> |
19 <!-- TODO (bug 1220863): Once we extend AppCompatActivity, set actionBar Style. --> | 19 <!-- TODO (bug 1220863): Once we extend AppCompatActivity, set actionBar Style. --> |
20 <item name="android:alertDialogTheme">@style/GeckoAlertDialog</item> | 20 <item name="android:alertDialogTheme">@style/GeckoAlertDialog</item> |
21 </style> | 21 </style> |
22 | 22 |
23 <style name="GeckoPreferencesBase" parent="Gecko"> | 23 <style name="GeckoPreferencesBase" parent="Gecko"> |
24 <item name="android:windowActionBar">true</item> | 24 <item name="android:windowActionBar">true</item> |
25 <item name="android:windowNoTitle">false</item> | 25 <item name="android:windowNoTitle">false</item> |
26 <item name="android:actionBarStyle">@style/ActionBar.GeckoPreferences</i tem> | 26 <item name="android:actionBarStyle">@style/ActionBar.GeckoPreferences</i tem> |
27 <item name="colorPrimary">@color/primary_material_dark</item> | |
René Jeschke
2016/05/17 10:21:13
Is this line really necessary? Also, this item alr
diegocarloslima
2016/05/17 12:19:53
This line isn't necessary (in the means of prevent
| |
27 </style> | 28 </style> |
28 | 29 |
29 <style name="GeckoAlertDialog" parent="@android:style/Theme.Material.Light.D ialog.Alert"> | 30 <style name="GeckoAlertDialog" parent="@android:style/Theme.Material.Light.D ialog.Alert"> |
30 <item name="android:colorAccent">@color/fennec_ui_orange</item> | 31 <item name="android:colorAccent">@color/fennec_ui_orange</item> |
31 </style> | 32 </style> |
32 | 33 |
33 <style name="ActionBar.FxAccountStatusActivity" parent="@android:style/Widge t.Material.ActionBar.Solid"> | 34 <style name="ActionBar.FxAccountStatusActivity" parent="@android:style/Widge t.Material.ActionBar.Solid"> |
34 <item name="android:displayOptions">homeAsUp|showTitle</item> | 35 <item name="android:displayOptions">homeAsUp|showTitle</item> |
35 <item name="android:titleTextStyle">@style/ActionBarTitleTextStyle</item > | 36 <item name="android:titleTextStyle">@style/ActionBarTitleTextStyle</item > |
36 </style> | 37 </style> |
37 | 38 |
38 <style name="ActionBar.GeckoPreferences" parent="@android:style/Widget.Mater ial.ActionBar.Solid"> | 39 <style name="ActionBar.GeckoPreferences" parent="@android:style/Widget.Mater ial.ActionBar.Solid"> |
39 <item name="android:titleTextStyle">@style/ActionBarTitleTextStyle</item > | 40 <item name="android:titleTextStyle">@style/ActionBarTitleTextStyle</item > |
40 </style> | 41 </style> |
41 | 42 |
42 <style name="GeckoAppBase" parent="Gecko"> | 43 <style name="GeckoAppBase" parent="Gecko"> |
43 <item name="android:actionButtonStyle">@style/GeckoActionBar.Button</ite m> | 44 <item name="android:actionButtonStyle">@style/GeckoActionBar.Button</ite m> |
44 <item name="android:listViewStyle">@style/Widget.ListView</item> | 45 <item name="android:listViewStyle">@style/Widget.ListView</item> |
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 |