Merge remote-tracking branch 'development' into linked-identities

This commit is contained in:
Vincent Breitmoser
2015-03-10 00:57:23 +01:00
179 changed files with 1531 additions and 947 deletions

View File

@@ -93,7 +93,7 @@
<activity
android:name=".ui.CreateKeyActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:windowSoftInputMode="stateHidden|adjustResize"
android:windowSoftInputMode="adjustResize"
android:label="@string/title_create_key"
android:parentActivityName=".ui.MainActivity">
<meta-data