diff options
author | mar-v-in <github@rvin.mooo.com> | 2014-07-01 00:15:30 +0200 |
---|---|---|
committer | mar-v-in <github@rvin.mooo.com> | 2014-07-01 00:15:30 +0200 |
commit | d1d414c006aa6b7b80b25b34f0c75a92a9603a85 (patch) | |
tree | 6375bd8a5436c866824190318d10d183d8548ab6 /OpenKeychain/src/main/AndroidManifest.xml | |
parent | 38823b73a31ae0fb82d7e385c141f1170127c4dd (diff) | |
parent | a9010045889d307ede37d154b0a2fece566c1845 (diff) | |
download | open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.tar.gz open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.tar.bz2 open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.zip |
Merge branch 'master' into improve-file-more
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
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 c6e528f4d..3ce200008 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -59,6 +59,7 @@ <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/> <uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.WRITE_CONTACTS" /> + <uses-permission android:name="android.permission.READ_PROFILE" /> <!-- android:allowBackup="false": Don't allow backup over adb backup or other apps! --> <application @@ -80,6 +81,11 @@ </intent-filter> </activity> <activity + android:name=".ui.WizardActivity" + android:configChanges="orientation|screenSize|keyboardHidden|keyboard" + android:label="@string/title_wizard" + android:windowSoftInputMode="stateHidden" /> + <activity android:name=".ui.EditKeyActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_edit_key" |