diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-02-26 22:26:40 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-02-26 22:26:40 +0530 |
| commit | 99ff9d2340689e1ebc274e463c86af0a03806491 (patch) | |
| tree | 7b3071c21dab1d026adfd5462ceaea31651c029e /OpenKeychain/src/main/res/values/themes.xml | |
| parent | ec353b0c390f7b3f45b950171e56c6ddcd0a9607 (diff) | |
| parent | 1210a80a96d9f862829ac1122e94b68fe8b8b5d7 (diff) | |
| download | open-keychain-99ff9d2340689e1ebc274e463c86af0a03806491.tar.gz open-keychain-99ff9d2340689e1ebc274e463c86af0a03806491.tar.bz2 open-keychain-99ff9d2340689e1ebc274e463c86af0a03806491.zip | |
merged dialog
Diffstat (limited to 'OpenKeychain/src/main/res/values/themes.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values/themes.xml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index f1d1ea490..c87895c01 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -3,21 +3,22 @@ <style name="KeychainTheme" parent="KeychainTheme.Base" /> - <!--<style name="KeychainTheme.Base" parent="HoloKeychainTheme">--> - <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light.NoActionBar"> - <item name="colorPrimary">@color/colorPrimary</item> - <item name="colorPrimaryDark">@color/colorPrimaryDark</item> + <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light"> + <item name="colorPrimary">@color/primary</item> + <item name="colorPrimaryDark">@color/primary_dark</item> <item name="colorAccent">@color/accent</item> <item name="android:windowNoTitle">true</item> <!-- remove actionbar, we use toolbar! --> <item name="windowActionBar">false</item> + <!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 --> + <item name="windowActionModeOverlay">true</item> <item name="searchViewStyle">@style/MySearchViewStyle</item> <!-- Navigation Drawer library --> <item name="drawerType">@integer/DRAWERTYPE_IMAGE</item> <!-- dark action bar... --> - <item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> + <item name="theme">@style/ThemeOverlay.AppCompat.Dark</item> <!-- ...but light popup menu (white background) --> <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item> <item name="drawerColor">#fafafa</item> |