Merge branch 'master' of https://github.com/PhilippC/keepass2android
This commit is contained in:
		| @@ -58,7 +58,7 @@ | ||||
|             </intent-filter> | ||||
|         </activity> | ||||
| 		 | ||||
| 		<activity android:configChanges="orientation" android:label="@string/app_name" android:theme="@style/MyTheme_Blue" android:name="keepass2android.PasswordActivity"  android:windowSoftInputMode="adjustResize"> | ||||
| 		<activity android:configChanges="orientation|keyboard|keyboardHidden" android:label="@string/app_name" android:theme="@style/MyTheme_Blue" android:name="keepass2android.PasswordActivity"  android:windowSoftInputMode="adjustResize"> | ||||
| 			<intent-filter android:label="@string/app_name"> | ||||
| 				<action android:name="android.intent.action.VIEW" /> | ||||
| 				<category android:name="android.intent.category.DEFAULT" /> | ||||
|   | ||||
| @@ -11,7 +11,7 @@ | ||||
| 				<category android:name="android.intent.category.DEFAULT" /> | ||||
| 			</intent-filter> | ||||
| 		</activity> | ||||
| 		<activity android:configChanges="keyboardHidden|orientation" android:label="@string/app_name" android:theme="@style/MyTheme" android:name="keepass2android.PasswordActivity"> | ||||
| 		<activity android:configChanges="orientation|keyboard|keyboardHidden" android:label="@string/app_name" android:theme="@style/MyTheme" android:name="keepass2android.PasswordActivity"> | ||||
| 			<intent-filter android:label="@string/app_name"> | ||||
| 				<action android:name="android.intent.action.VIEW" /> | ||||
| 				<category android:name="android.intent.category.DEFAULT" /> | ||||
|   | ||||
| @@ -62,7 +62,7 @@ | ||||
|                 <category android:name="android.intent.category.DEFAULT" /> | ||||
|             </intent-filter> | ||||
|         </activity> | ||||
| 		<activity android:configChanges="orientation" android:label="@string/app_name" android:theme="@style/MyTheme_Blue" android:name="keepass2android.PasswordActivity"  android:windowSoftInputMode="adjustResize"> | ||||
| 		<activity android:configChanges="orientation|keyboard|keyboardHidden" android:label="@string/app_name" android:theme="@style/MyTheme_Blue" android:name="keepass2android.PasswordActivity"  android:windowSoftInputMode="adjustResize"> | ||||
|       <intent-filter android:label="@string/app_name"> | ||||
|         <action android:name="android.intent.action.VIEW" /> | ||||
|         <category android:name="android.intent.category.DEFAULT" /> | ||||
|   | ||||
| @@ -43,7 +43,7 @@ | ||||
|             </intent-filter> | ||||
|         </activity> | ||||
|   | ||||
| 		<activity android:configChanges="orientation" android:label="@string/app_name" android:theme="@style/MyTheme_Blue" android:name="keepass2android.PasswordActivity" android:windowSoftInputMode="adjustResize"> | ||||
| 		<activity android:configChanges="orientation|keyboard|keyboardHidden" android:label="@string/app_name" android:theme="@style/MyTheme_Blue" android:name="keepass2android.PasswordActivity" android:windowSoftInputMode="adjustResize"> | ||||
|       <intent-filter android:label="@string/app_name"> | ||||
|         <action android:name="android.intent.action.VIEW" /> | ||||
|         <category android:name="android.intent.category.DEFAULT" /> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Philipp Crocoll
					Philipp Crocoll