Fix API 23 regression for activities without layout, see http://stackoverflow.com/q/32169303
This commit is contained in:
@@ -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!
|
||||
|
||||
7
OpenKeychain/src/main/res/values-v23/themes.xml
Normal file
7
OpenKeychain/src/main/res/values-v23/themes.xml
Normal file
@@ -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>
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user