diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-11-02 18:09:41 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-11-02 18:09:41 +0100 |
commit | 05df0a63b71d00ad2beba57857c27f9ed50e30ba (patch) | |
tree | 8a0e8e79ccffa7986d70fe6ed4e25b0e1f806f75 /OpenKeychain/src/main | |
parent | 0641b9cba68aa0093f1b1b7aa937caa50e9f5669 (diff) | |
download | open-keychain-05df0a63b71d00ad2beba57857c27f9ed50e30ba.tar.gz open-keychain-05df0a63b71d00ad2beba57857c27f9ed50e30ba.tar.bz2 open-keychain-05df0a63b71d00ad2beba57857c27f9ed50e30ba.zip |
Fix API 23 regression for activities without layout, see http://stackoverflow.com/q/32169303
Diffstat (limited to 'OpenKeychain/src/main')
-rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 12 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-v23/themes.xml | 7 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/themes.xml | 8 |
3 files changed, 17 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 8730a456e..296685684 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -466,7 +466,7 @@ android:name=".ui.ImportKeysProxyActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/app_name" - android:theme="@android:style/Theme.NoDisplay" + android:theme="@style/Theme.Keychain.Transparent" android:windowSoftInputMode="stateHidden"> <!-- VIEW with fingerprint scheme: @@ -692,19 +692,19 @@ android:label="@string/title_log_display" /> <activity android:name=".ui.ConsolidateDialogActivity" - android:theme="@android:style/Theme.NoDisplay" /> + android:theme="@style/Theme.Keychain.Transparent" /> <activity android:name=".ui.PassphraseDialogActivity" - android:theme="@android:style/Theme.NoDisplay" /> + android:theme="@style/Theme.Keychain.Transparent" /> <activity android:name=".ui.RetryUploadDialogActivity" - android:theme="@android:style/Theme.NoDisplay" /> + android:theme="@style/Theme.Keychain.Transparent" /> <activity android:name=".ui.DeleteKeyDialogActivity" - android:theme="@android:style/Theme.NoDisplay" /> + android:theme="@style/Theme.Keychain.Transparent" /> <activity android:name=".ui.OrbotRequiredDialogActivity" - android:theme="@android:style/Theme.NoDisplay" /> + android:theme="@style/Theme.Keychain.Transparent" /> <!-- NOTE: singleTop is set to get NFC foreground dispatch to work. Then, all NFC intents will be broadcasted to onNewIntent() of this activity! diff --git a/OpenKeychain/src/main/res/values-v23/themes.xml b/OpenKeychain/src/main/res/values-v23/themes.xml new file mode 100644 index 000000000..29bd762c0 --- /dev/null +++ b/OpenKeychain/src/main/res/values-v23/themes.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <!-- see http://stackoverflow.com/questions/32169303/activity-did-not-call-finish-api-23 --> + <style name="Theme.Keychain.Transparent" parent="@android:style/Theme.Translucent.NoTitleBar" /> + +</resources> diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 38cf8a3db..fc6ae3846 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -85,11 +85,9 @@ <item name="alertDialogTheme">@style/Theme.Keychain.Dark.Dialog.Alert</item> </style> - <style name="Theme.Keychain.Light" parent="Base.Theme.Keychain.Light"> - </style> + <style name="Theme.Keychain.Light" parent="Base.Theme.Keychain.Light"></style> - <style name="Theme.Keychain.Dark" parent="Base.Theme.Keychain.Dark"> - </style> + <style name="Theme.Keychain.Dark" parent="Base.Theme.Keychain.Dark"></style> <!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html --> <style name="Widget.Keychain.SearchView" parent="Widget.AppCompat.SearchView"> @@ -134,4 +132,6 @@ <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> </style> + + <style name="Theme.Keychain.Transparent" parent="@android:style/Theme.NoDisplay" /> </resources> |