diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-14 16:21:04 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-14 16:21:04 +0200 |
| commit | 3814ae7d53a22ba89f1e39d7a4661016f76cf8c8 (patch) | |
| tree | d83d41d3c424a784da144515665fb41ef650aa52 /OpenKeychain/src/main/res/values/themes.xml | |
| parent | dbaf7070ead596f5c70ad48fc55aada2f77a856a (diff) | |
| parent | d5dd6a49c8156a699b3fbbbeef06658e1c232c16 (diff) | |
| download | open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.tar.gz open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.tar.bz2 open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.zip | |
Merge branch 'master' into mime4j
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/values/themes.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values/themes.xml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 2b1c00ba9..38cf8a3db 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -39,7 +39,7 @@ <item name="searchViewStyle">@style/Widget.Keychain.SearchView</item> <!-- style dialogs --> - <item name="alertDialogTheme">@style/Theme.Keychain.Light.Dialog</item> + <item name="alertDialogTheme">@style/Theme.Keychain.Light.Dialog.Alert</item> </style> <style name="Base.Theme.Keychain.Dark" parent="MaterialDrawerTheme.ActionBar"> @@ -82,7 +82,7 @@ <item name="searchViewStyle">@style/Widget.Keychain.SearchView</item> <!-- style dialogs --> - <item name="alertDialogTheme">@style/Theme.Keychain.Dark.Dialog</item> + <item name="alertDialogTheme">@style/Theme.Keychain.Dark.Dialog.Alert</item> </style> <style name="Theme.Keychain.Light" parent="Base.Theme.Keychain.Light"> @@ -111,20 +111,26 @@ <!--<item name="suggestionRowLayout">...</item>--> </style> - <style name="Theme.Keychain.Light.Dialog" parent="Base.Theme.AppCompat.Light.Dialog.Alert"> + <style name="Theme.Keychain.Light.Dialog.Alert" parent="Base.Theme.AppCompat.Light.Dialog.Alert"> <item name="colorAccent">#7bad45</item> </style> - <style name="Theme.Keychain.Dark.Dialog" parent="Base.Theme.AppCompat.Dialog.Alert"> + <style name="Theme.Keychain.Dark.Dialog.Alert" parent="Base.Theme.AppCompat.Dialog.Alert"> <item name="colorAccent">#268bd2</item> </style> - <style name="Theme.Keychain.Light.Dialog.SecurityToken" parent="Theme.AppCompat.Light.Dialog.MinWidth"> + <style name="Theme.Keychain.Light.Dialog" parent="Theme.AppCompat.Light.Dialog.MinWidth"> + <item name="colorAccent">#7bad45</item> + <item name="android:buttonStyle">@style/MaterialFlatButton</item> + <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> </style> - <style name="Theme.Keychain.Dark.Dialog.SecurityToken" parent="Theme.AppCompat.Dialog.MinWidth"> + <style name="Theme.Keychain.Dark.Dialog" parent="Theme.AppCompat.Dialog.MinWidth"> + <item name="colorAccent">#268bd2</item> + <item name="android:buttonStyle">@style/MaterialFlatButton</item> + <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> </style> |