diff options
Diffstat (limited to 'OpenKeychain/src/main')
-rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/themes.xml | 16 |
2 files changed, 16 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 35048b936..6b84194fc 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -701,7 +701,7 @@ --> <activity android:name=".ui.NfcOperationActivity" - android:theme="@style/KeychainTheme.YubiKeyDialog" + android:theme="@style/KeychainTheme.LightSecurityTokenDialog" android:allowTaskReparenting="true" android:launchMode="singleTop" android:taskAffinity=":Nfc" /> diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 4fc4ea1f5..559563a54 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -37,6 +37,9 @@ <!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 --> <item name="windowActionModeOverlay">true</item> <item name="searchViewStyle">@style/MySearchViewStyle</item> + + <!-- style dialogs --> + <item name="alertDialogTheme">@style/KeychainTheme.LightDialog</item> </style> <style name="DarkBaseTheme" parent="MaterialDrawerTheme.ActionBar"> @@ -77,6 +80,9 @@ <!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 --> <item name="windowActionModeOverlay">true</item> <item name="searchViewStyle">@style/MySearchViewStyle</item> + + <!-- style dialogs --> + <item name="alertDialogTheme">@style/KeychainTheme.DarkDialog</item> </style> <style name="LightTheme" parent="LightBaseTheme"> @@ -105,7 +111,15 @@ <!--<item name="suggestionRowLayout">...</item>--> </style> - <style name="KeychainTheme.YubiKeyDialog" parent="@style/Theme.AppCompat.Light.Dialog.MinWidth"> + <style name="KeychainTheme.LightDialog" parent="Base.Theme.AppCompat.Light.Dialog.Alert"> + <item name="colorAccent">#7bad45</item> + </style> + + <style name="KeychainTheme.DarkDialog" parent="Base.Theme.AppCompat.Light.Dialog.Alert"> + <item name="colorAccent">#268bd2</item> + </style> + + <style name="KeychainTheme.LightSecurityTokenDialog" parent="Theme.AppCompat.Light.Dialog.MinWidth"> <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> </style> |