diff options
| author | Thialfihar <thialfihar@gmail.com> | 2010-05-09 19:51:21 +0000 |
|---|---|---|
| committer | Thialfihar <thialfihar@gmail.com> | 2010-05-09 19:51:21 +0000 |
| commit | 5e73b696d1ff7d39df933a6de5f89b46f8ace22a (patch) | |
| tree | bf1c3e13f7b7cf9822f4a2c69818c312c3fa332a /AndroidManifest.xml | |
| parent | 6e3f1822915c40e1f24822b667ce8dcfcd5c7258 (diff) | |
| download | open-keychain-5e73b696d1ff7d39df933a6de5f89b46f8ace22a.tar.gz open-keychain-5e73b696d1ff7d39df933a6de5f89b46f8ace22a.tar.bz2 open-keychain-5e73b696d1ff7d39df933a6de5f89b46f8ace22a.zip | |
new EncryptActivity to handle message and file encryption all in one
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index aad122eb3..99d095a37 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -61,22 +61,12 @@ android:configChanges="keyboardHidden|orientation|keyboard"/> <activity - android:name=".EncryptMessageActivity" - android:label="@string/title_encryptMessage" + android:name=".EncryptActivity" + android:label="@string/title_encrypt" android:configChanges="keyboardHidden|orientation|keyboard"> <intent-filter> <action android:name="org.thialfihar.android.apg.intent.ENCRYPT" /> - </intent-filter> - - </activity> - - <activity - android:name=".EncryptFileActivity" - android:label="@string/title_encryptFile" - android:configChanges="keyboardHidden|orientation|keyboard"> - - <intent-filter> <action android:name="org.thialfihar.android.apg.intent.ENCRYPT_FILE" /> </intent-filter> |