From 5b1bf888b4c69fd9bed0613917f01fcebf9c8529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sun, 10 May 2015 11:15:10 +0200 Subject: [PATCH] Reformat manifest --- OpenKeychain/src/main/AndroidManifest.xml | 46 +++++++++++------------ 1 file 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"> + android:parentActivityName=".ui.MainActivity" + android:windowSoftInputMode="adjustResize"> @@ -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"> @@ -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"> @@ -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"> @@ -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"> @@ -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"> @@ -633,14 +633,14 @@ - - + + - + - + @@ -690,9 +690,9 @@ --> + android:taskAffinity=":Nfc" /> @@ -806,8 +806,8 @@ + android:exported="true" + android:writePermission="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" />