cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/LuboViluda/open-keychain into LuboViluda-master

Browse Source
This commit is contained in:
Dominik Schürmann
2016-04-29 23:03:13 +02:00
parent fad63cc76f 8933263665
commit 67607933ad
3 changed files with 75 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -726,6 +726,16 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.MainActivity" />
</activity>
<activity
android:name=".ui.RedirectImportKeysActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_activity_redirect_key"
android:theme="@style/Theme.Keychain.Transparent">
<!-- VIEW with fingerprint scheme:
Handle URIs with fingerprints when scanning directly from Barcode Scanner -->
<intent-filter android:label="@string/intent_import_key">
@@ -741,11 +751,9 @@
<data android:scheme="OpenPGP4Fpr" />
<data android:scheme="OpenPGP4fpr" />
</intent-filter>
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.MainActivity" />
</activity>
<activity
android:name=".ui.LogDisplayActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"