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/AndroidManifest.xml | |
| 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/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 12 |
1 files changed, 6 insertions, 6 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! |