diff options
| author | senecaso <senecaso@bertha> | 2011-10-17 10:07:37 +0900 |
|---|---|---|
| committer | senecaso <senecaso@bertha> | 2011-10-17 10:07:37 +0900 |
| commit | debb90409a0a90ce9351c83e42cb72f8935bacb1 (patch) | |
| tree | 7e61de006c0cad43019698f7e2267285f550e198 /AndroidManifest.xml | |
| parent | 6f2333b7d3ff892697e993e4af2053a695f19402 (diff) | |
| download | open-keychain-debb90409a0a90ce9351c83e42cb72f8935bacb1.tar.gz open-keychain-debb90409a0a90ce9351c83e42cb72f8935bacb1.tar.bz2 open-keychain-debb90409a0a90ce9351c83e42cb72f8935bacb1.zip | |
-implementation of "--send-key"
-implementation of "--sign-key"
-partial implementation of exchanging/verifying keys via QR Code
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8c7dd53fe..b8f738795 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -184,6 +184,11 @@ android:configChanges="keyboardHidden|orientation|keyboard"/> <activity + android:name=".SendKeyActivity" + android:label="@string/title_sendKey" + android:configChanges="keyboardHidden|orientation|keyboard"/> + + <activity android:name=".PreferencesActivity" android:label="@string/title_preferences" android:configChanges="keyboardHidden|orientation|keyboard"/> @@ -193,6 +198,17 @@ android:label="@string/title_keyServerPreference" android:configChanges="keyboardHidden|orientation|keyboard"/> + <activity + android:name=".SignKeyActivity" + android:label="@string/title_signKey" + android:configChanges="keyboardHidden|orientation|keyboard"/> + + <activity + android:name=".ImportFromQRCodeActivity" + android:label="@string/title_importFromQRCode" + android:configChanges="keyboardHidden|orientation|keyboard"/> + + <service android:name=".Service" /> <provider |