cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/t/snackbar' into development

Browse Source 
Conflicts:
	OpenKeychain/build.gradle
This commit is contained in:
Dominik Schürmann
2015-01-29 09:55:09 +01:00
parent 81d4d31fd7 198ddfeff7
commit 5564f65a69
11 changed files with 370 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/AndroidManifest.xml
View File

@@ -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">
@@ -85,6 +85,11 @@
<category android:name="android.intent.category.LAUNCHER" />
</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"