moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 12:32:17 -05:00
Code Issues Releases Wiki Activity

Fix back button in encrypt activities

Browse Source
This commit is contained in:
Dominik Schürmann 2015-02-22 21:39:20 +01:00
parent 0cdd68e763
commit 21e7102e3a
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenKeychain/src/main/AndroidManifest.xml
View File

@ -145,7 +145,11 @@
android:name=".ui.EncryptFilesActivity" android:name=".ui.EncryptFilesActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_encrypt_files" android:label="@string/title_encrypt_files"
android:windowSoftInputMode="stateHidden"> android:windowSoftInputMode="stateHidden"
android:parentActivityName=".ui.MainActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.MainActivity" />
<!-- Keychain's own Actions --> <!-- Keychain's own Actions -->
<!-- ENCRYPT with data Uri --> <!-- ENCRYPT with data Uri -->
@ -174,7 +178,11 @@
android:name=".ui.EncryptTextActivity" android:name=".ui.EncryptTextActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_encrypt_text" android:label="@string/title_encrypt_text"
android:windowSoftInputMode="stateHidden"> android:windowSoftInputMode="stateHidden"
android:parentActivityName=".ui.MainActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.MainActivity" />
<!-- Keychain's own Actions --> <!-- Keychain's own Actions -->
<!-- ENCRYPT with text as extra --> <!-- ENCRYPT with text as extra -->
@ -405,8 +413,7 @@
<activity <activity
android:name=".ui.ViewKeyAdvancedActivity" android:name=".ui.ViewKeyAdvancedActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_advanced_key_info"> android:label="@string/title_advanced_key_info"></activity>
</activity>
<activity <activity
android:name=".ui.SettingsActivity" android:name=".ui.SettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
@ -652,8 +659,7 @@
android:configChanges="orientation|screenSize|keyboard|keyboardHidden" android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
android:screenOrientation="user" android:screenOrientation="user"
android:theme="@style/Alp.42447968.Theme.Dialog.Light" /> android:theme="@style/Alp.42447968.Theme.Dialog.Light" />
<activity <activity android:name=".ui.PassphraseWizardActivity" />
android:name=".ui.PassphraseWizardActivity" />
<!-- <!--
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!