diff options
Diffstat (limited to 'OpenKeychain/src')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index aa3d46ec1..f979015ea 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -73,8 +73,8 @@ android:allowBackup="false" android:hardwareAccelerated="true" android:icon="@drawable/ic_launcher" - android:theme="@style/KeychainTheme" - android:label="@string/app_name"> + android:label="@string/app_name" + android:theme="@style/KeychainTheme"> <activity android:name=".ui.MainActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" @@ -88,11 +88,11 @@ </activity> <activity android:name=".ui.CreateKeyActivity" - android:windowSoftInputMode="adjustResize" + android:allowTaskReparenting="true" android:label="@string/title_manage_my_keys" android:launchMode="singleTop" - android:allowTaskReparenting="true" - android:parentActivityName=".ui.MainActivity"> + android:parentActivityName=".ui.MainActivity" + android:windowSoftInputMode="adjustResize"> <meta-data android:name="android.support.PARENT_ACTIVITY" android:value=".ui.MainActivity" /> @@ -132,8 +132,8 @@ android:name=".ui.SafeSlingerActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_exchange_keys" - android:windowSoftInputMode="stateHidden" - android:parentActivityName=".ui.MainActivity"> + android:parentActivityName=".ui.MainActivity" + android:windowSoftInputMode="stateHidden"> <meta-data android:name="android.support.PARENT_ACTIVITY" android:value=".ui.MainActivity" /> @@ -142,8 +142,8 @@ android:name=".ui.EncryptFilesActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_encrypt_files" - android:windowSoftInputMode="stateHidden" - android:parentActivityName=".ui.MainActivity"> + android:parentActivityName=".ui.MainActivity" + android:windowSoftInputMode="stateHidden"> <meta-data android:name="android.support.PARENT_ACTIVITY" android:value=".ui.MainActivity" /> @@ -174,8 +174,8 @@ android:name=".ui.EncryptTextActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_encrypt_text" - android:windowSoftInputMode="stateHidden" - android:parentActivityName=".ui.MainActivity"> + android:parentActivityName=".ui.MainActivity" + android:windowSoftInputMode="stateHidden"> <meta-data android:name="android.support.PARENT_ACTIVITY" android:value=".ui.MainActivity" /> @@ -200,8 +200,8 @@ android:name=".ui.DecryptTextActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_decrypt" - android:windowSoftInputMode="stateHidden" - android:parentActivityName=".ui.MainActivity"> + android:parentActivityName=".ui.MainActivity" + android:windowSoftInputMode="stateHidden"> <meta-data android:name="android.support.PARENT_ACTIVITY" android:value=".ui.MainActivity" /> @@ -226,8 +226,8 @@ android:name=".ui.DecryptFilesActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_decrypt" - android:windowSoftInputMode="stateHidden" - android:parentActivityName=".ui.MainActivity"> + android:parentActivityName=".ui.MainActivity" + android:windowSoftInputMode="stateHidden"> <meta-data android:name="android.support.PARENT_ACTIVITY" android:value=".ui.MainActivity" /> @@ -633,14 +633,14 @@ <category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.DEFAULT" /> - <data android:scheme="https"/> - <data android:scheme="http"/> + <data android:scheme="https" /> + <data android:scheme="http" /> <!-- if we don't specify a host, pathPattern will be ignored--> - <data android:host="*"/> + <data android:host="*" /> <!-- convention for keyserver paths specified by internet draft draft-shaw-openpgp-hkp-00.txt (http://tools.ietf.org/html/draft-shaw-openpgp-hkp-00#section-3) --> - <data android:pathPattern="/pks/lookup.*"/> + <data android:pathPattern="/pks/lookup.*" /> </intent-filter> <!-- IMPORT_KEY with files TODO: does this work? --> @@ -690,9 +690,9 @@ --> <activity android:name=".ui.NfcOperationActivity" + android:allowTaskReparenting="true" android:launchMode="singleTop" - android:taskAffinity=":Nfc" - android:allowTaskReparenting="true" /> + android:taskAffinity=":Nfc" /> <!--<activity--> <!--android:name=".ui.NfcIntentActivity"--> @@ -806,8 +806,8 @@ <provider android:name=".provider.TemporaryStorageProvider" android:authorities="org.sufficientlysecure.keychain.tempstorage" - android:writePermission="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" - android:exported="true" /> + android:exported="true" + android:writePermission="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" /> </application> |