зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1201206 - Inherit from appCompat on v21 prefs and restore action bar style. r=mhaigh
--HG-- extra : commitid : 61T7SZ2qk2V extra : source : 2d7962287928829803e68fe5cd1aeabd69003837
This commit is contained in:
Родитель
bb99cec3ae
Коммит
8a0721f138
|
@ -0,0 +1,19 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<resources>
|
||||
|
||||
<style name="ActionBarTitleTextStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
|
||||
<item name="android:textColor">#fff</item>
|
||||
</style>
|
||||
|
||||
<style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
|
||||
<item name="android:colorControlNormal">#fff</item>
|
||||
|
||||
<!-- This color is the system default. -->
|
||||
<item name="android:colorControlHighlight">#65696D</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
|
@ -14,14 +14,23 @@
|
|||
<item name="android:windowNoTitle">true</item>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="android:actionBarStyle">@style/GeckoActionBar</item>
|
||||
<item name="android:actionBarTheme">@style/ActionBarTheme</item>
|
||||
<item name="android:colorAccent">@color/action_orange</item>
|
||||
</style>
|
||||
|
||||
<style name="GeckoPreferencesBase" parent="GeckoBase">
|
||||
<item name="android:windowActionBar">true</item>
|
||||
<item name="android:windowNoTitle">false</item>
|
||||
<item name="android:actionBarStyle">@style/ActionBar.GeckoPreferences</item>
|
||||
</style>
|
||||
|
||||
<style name="ActionBar.FxAccountStatusActivity" parent="@android:style/Widget.Material.ActionBar.Solid">
|
||||
<item name="android:displayOptions">homeAsUp|showTitle</item>
|
||||
<item name="android:titleTextStyle">@style/ActionBarTitleTextStyle</item>
|
||||
</style>
|
||||
|
||||
<style name="ActionBar.GeckoPreferences" parent="@android:style/Widget.Material.ActionBar.Solid">
|
||||
<item name="android:titleTextStyle">@style/ActionBarTitleTextStyle</item>
|
||||
</style>
|
||||
|
||||
<style name="GeckoAppBase" parent="Gecko">
|
||||
|
|
Загрузка…
Ссылка в новой задаче