diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-29 09:55:09 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-29 09:55:09 +0100 |
| commit | 5564f65a69d3d6bdc6ff7fbf61004f31a0017877 (patch) | |
| tree | 40cc93f06a95a9c0a64b5c9a59762c15e26923c5 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | 81d4d31fd746db2d7707fb8bffb52406f431bef2 (diff) | |
| parent | 198ddfeff7324533fb2daea778891def04f8e8c2 (diff) | |
| download | open-keychain-5564f65a69d3d6bdc6ff7fbf61004f31a0017877.tar.gz open-keychain-5564f65a69d3d6bdc6ff7fbf61004f31a0017877.tar.bz2 open-keychain-5564f65a69d3d6bdc6ff7fbf61004f31a0017877.zip | |
Merge remote-tracking branch 'origin/t/snackbar' into development
Conflicts:
OpenKeychain/build.gradle
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 536b66319..865e0272d 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -75,7 +75,7 @@ android:theme="@style/KeychainTheme" android:label="@string/app_name"> <activity - android:name=".ui.KeyListActivity" + android:name=".ui.MainActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/app_name" android:launchMode="singleTop"> @@ -86,6 +86,11 @@ </intent-filter> </activity> <activity + android:name=".ui.KeyListActivity" + android:configChanges="orientation|screenSize|keyboardHidden|keyboard" + android:label="@string/app_name" + android:windowSoftInputMode="stateAlwaysHidden" /> + <activity android:name=".ui.FirstTimeActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/app_name" |