Fix API 23 regression for activities without layout, see http://stackoverflow.com/q/32169303

This commit is contained in:
Dominik Schürmann
2015-11-02 18:09:41 +01:00
parent 0641b9cba6
commit 05df0a63b7
3 changed files with 17 additions and 10 deletions

View File

@@ -466,7 +466,7 @@
android:name=".ui.ImportKeysProxyActivity" android:name=".ui.ImportKeysProxyActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@android:style/Theme.NoDisplay" android:theme="@style/Theme.Keychain.Transparent"
android:windowSoftInputMode="stateHidden"> android:windowSoftInputMode="stateHidden">
<!-- VIEW with fingerprint scheme: <!-- VIEW with fingerprint scheme:
@@ -692,19 +692,19 @@
android:label="@string/title_log_display" /> android:label="@string/title_log_display" />
<activity <activity
android:name=".ui.ConsolidateDialogActivity" android:name=".ui.ConsolidateDialogActivity"
android:theme="@android:style/Theme.NoDisplay" /> android:theme="@style/Theme.Keychain.Transparent" />
<activity <activity
android:name=".ui.PassphraseDialogActivity" android:name=".ui.PassphraseDialogActivity"
android:theme="@android:style/Theme.NoDisplay" /> android:theme="@style/Theme.Keychain.Transparent" />
<activity <activity
android:name=".ui.RetryUploadDialogActivity" android:name=".ui.RetryUploadDialogActivity"
android:theme="@android:style/Theme.NoDisplay" /> android:theme="@style/Theme.Keychain.Transparent" />
<activity <activity
android:name=".ui.DeleteKeyDialogActivity" android:name=".ui.DeleteKeyDialogActivity"
android:theme="@android:style/Theme.NoDisplay" /> android:theme="@style/Theme.Keychain.Transparent" />
<activity <activity
android:name=".ui.OrbotRequiredDialogActivity" 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. NOTE: singleTop is set to get NFC foreground dispatch to work.
Then, all NFC intents will be broadcasted to onNewIntent() of this activity! Then, all NFC intents will be broadcasted to onNewIntent() of this activity!

View 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>

View File

@@ -85,11 +85,9 @@
<item name="alertDialogTheme">@style/Theme.Keychain.Dark.Dialog.Alert</item> <item name="alertDialogTheme">@style/Theme.Keychain.Dark.Dialog.Alert</item>
</style> </style>
<style name="Theme.Keychain.Light" parent="Base.Theme.Keychain.Light"> <style name="Theme.Keychain.Light" parent="Base.Theme.Keychain.Light"></style>
</style>
<style name="Theme.Keychain.Dark" parent="Base.Theme.Keychain.Dark"> <style name="Theme.Keychain.Dark" parent="Base.Theme.Keychain.Dark"></style>
</style>
<!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html --> <!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html -->
<style name="Widget.Keychain.SearchView" parent="Widget.AppCompat.SearchView"> <style name="Widget.Keychain.SearchView" parent="Widget.AppCompat.SearchView">
@@ -134,4 +132,6 @@
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
</style> </style>
<style name="Theme.Keychain.Transparent" parent="@android:style/Theme.NoDisplay" />
</resources> </resources>