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

Merge branch 'master' into ditch-appmsg

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
This commit is contained in:
Vincent Breitmoser
2014-07-26 23:06:32 +02:00
parent d8f2782293 45722d7cfb
commit 8132b9ac74
174 changed files with 5350 additions and 1267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,9 +81,14 @@
</intent-filter>
</activity>
<activity
android:name=".ui.WizardActivity"
android:name=".ui.FirstTimeActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_wizard"
android:label="@string/app_name"
android:windowSoftInputMode="stateHidden" />
<activity
android:name=".ui.CreateKeyActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_create_key"
android:windowSoftInputMode="stateHidden" />
<activity
android:name=".ui.EditKeyActivity"