diff options
author | Christian S <christian@pix-art.de> | 2015-07-20 23:04:07 +0200 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2015-07-20 23:04:07 +0200 |
commit | 5ffeed8edb2ad89f942631b93472282313d1559b (patch) | |
tree | 5be64514c3a3452101b90fecd0cb829474528dc8 /src/main/AndroidManifest.xml | |
parent | 7640c4d1d44ef9d83be4ad23ae4481879d0c351b (diff) | |
parent | 8be0e8a27ddd4d55a48a38efc5434a581be6f1b3 (diff) |
copy commits
Diffstat (limited to 'src/main/AndroidManifest.xml')
-rw-r--r-- | src/main/AndroidManifest.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 9fe370171..b0611f848 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -131,6 +131,10 @@ </intent-filter> </activity> <activity + android:name=".ui.TrustKeysActivity" + android:label="@string/trust_keys" + android:windowSoftInputMode="stateAlwaysHidden"/> + <activity android:name="de.duenndns.ssl.MemorizingActivity" android:theme="@style/ConversationsTheme" tools:replace="android:theme"/> |