diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-12-30 13:09:27 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-12-30 13:09:27 +0100 |
| commit | 9e663237b6dc4880bcdb1c763374c44f9f4416d2 (patch) | |
| tree | 3c317cf8a9e320db0b6ff5c451b82e7b32014627 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | 2223cdd4056341576a540b065bcb34a1e579b141 (diff) | |
| parent | ccde6add70ea9b5c559910d42dfb2e0bf79f5989 (diff) | |
| download | open-keychain-9e663237b6dc4880bcdb1c763374c44f9f4416d2.tar.gz open-keychain-9e663237b6dc4880bcdb1c763374c44f9f4416d2.tar.bz2 open-keychain-9e663237b6dc4880bcdb1c763374c44f9f4416d2.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 100f584c1..193d3863f 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -659,6 +659,12 @@ <activity android:name=".ui.PassphraseDialogActivity" android:theme="@android:style/Theme.NoDisplay" /> + <activity + android:name="com.haibison.android.lockpattern.LockPatternActivity" + android:label="@string/title_unlock" + android:configChanges="orientation|screenSize|keyboard|keyboardHidden" + android:screenOrientation="user" + android:theme="@style/Alp.42447968.Theme.Dialog.Light" /> <!-- NOTE: singleTop is set to get NFC foreground dispatch to work. Then, all NFC intents will be broadcasted to onNewIntent() of this activity! |