diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-06 19:14:25 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-06 19:14:25 +0200 |
commit | 70fb36d5d68b5ccb3acdcd236af3007c6ba7a117 (patch) | |
tree | a4f668850e1d9cf1439604a7f5e82dbf01207745 | |
parent | 7d3113ca15cc7bb3f3ea3c10755c3f3fe0fce8ae (diff) | |
download | open-keychain-70fb36d5d68b5ccb3acdcd236af3007c6ba7a117.tar.gz open-keychain-70fb36d5d68b5ccb3acdcd236af3007c6ba7a117.tar.bz2 open-keychain-70fb36d5d68b5ccb3acdcd236af3007c6ba7a117.zip |
Change icon of API Demo for differentiation with main app
-rw-r--r-- | OpenPGP-Keychain-API-Demo/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | OpenPGP-Keychain-API-Demo/ic_launcher-web.png | bin | 0 -> 23512 bytes | |||
-rw-r--r-- | OpenPGP-Keychain-API-Demo/res/drawable-hdpi/ic_launcher.png | bin | 0 -> 2626 bytes | |||
-rw-r--r-- | OpenPGP-Keychain-API-Demo/res/drawable-hdpi/icon.png | bin | 5308 -> 0 bytes | |||
-rw-r--r-- | OpenPGP-Keychain-API-Demo/res/drawable-ldpi/icon.png | bin | 2027 -> 0 bytes | |||
-rw-r--r-- | OpenPGP-Keychain-API-Demo/res/drawable-mdpi/ic_launcher.png | bin | 0 -> 1732 bytes | |||
-rw-r--r-- | OpenPGP-Keychain-API-Demo/res/drawable-mdpi/icon.png | bin | 3035 -> 0 bytes | |||
-rw-r--r-- | OpenPGP-Keychain-API-Demo/res/drawable-xhdpi/ic_launcher.png | bin | 0 -> 3517 bytes | |||
-rw-r--r-- | OpenPGP-Keychain-API-Demo/res/drawable-xhdpi/icon.png | bin | 8165 -> 0 bytes | |||
-rw-r--r-- | OpenPGP-Keychain-API-Demo/res/drawable-xxhdpi/ic_launcher.png | bin | 0 -> 5717 bytes | |||
-rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java | 1 |
11 files changed, 1 insertions, 2 deletions
diff --git a/OpenPGP-Keychain-API-Demo/AndroidManifest.xml b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml index 730ddd274..a11b6e623 100644 --- a/OpenPGP-Keychain-API-Demo/AndroidManifest.xml +++ b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml @@ -12,7 +12,7 @@ android:targetSdkVersion="14" /> <application - android:icon="@drawable/icon" + android:icon="@drawable/ic_launcher" android:label="OpenPGP Keychain API Demo" > <activity android:name=".BaseActivity" diff --git a/OpenPGP-Keychain-API-Demo/ic_launcher-web.png b/OpenPGP-Keychain-API-Demo/ic_launcher-web.png Binary files differnew file mode 100644 index 000000000..ae4cd0976 --- /dev/null +++ b/OpenPGP-Keychain-API-Demo/ic_launcher-web.png diff --git a/OpenPGP-Keychain-API-Demo/res/drawable-hdpi/ic_launcher.png b/OpenPGP-Keychain-API-Demo/res/drawable-hdpi/ic_launcher.png Binary files differnew file mode 100644 index 000000000..cf114d7db --- /dev/null +++ b/OpenPGP-Keychain-API-Demo/res/drawable-hdpi/ic_launcher.png diff --git a/OpenPGP-Keychain-API-Demo/res/drawable-hdpi/icon.png b/OpenPGP-Keychain-API-Demo/res/drawable-hdpi/icon.png Binary files differdeleted file mode 100644 index 6b8cc3d73..000000000 --- a/OpenPGP-Keychain-API-Demo/res/drawable-hdpi/icon.png +++ /dev/null diff --git a/OpenPGP-Keychain-API-Demo/res/drawable-ldpi/icon.png b/OpenPGP-Keychain-API-Demo/res/drawable-ldpi/icon.png Binary files differdeleted file mode 100644 index a1adf6bcb..000000000 --- a/OpenPGP-Keychain-API-Demo/res/drawable-ldpi/icon.png +++ /dev/null diff --git a/OpenPGP-Keychain-API-Demo/res/drawable-mdpi/ic_launcher.png b/OpenPGP-Keychain-API-Demo/res/drawable-mdpi/ic_launcher.png Binary files differnew file mode 100644 index 000000000..d55318843 --- /dev/null +++ b/OpenPGP-Keychain-API-Demo/res/drawable-mdpi/ic_launcher.png diff --git a/OpenPGP-Keychain-API-Demo/res/drawable-mdpi/icon.png b/OpenPGP-Keychain-API-Demo/res/drawable-mdpi/icon.png Binary files differdeleted file mode 100644 index 6b10a2ad3..000000000 --- a/OpenPGP-Keychain-API-Demo/res/drawable-mdpi/icon.png +++ /dev/null diff --git a/OpenPGP-Keychain-API-Demo/res/drawable-xhdpi/ic_launcher.png b/OpenPGP-Keychain-API-Demo/res/drawable-xhdpi/ic_launcher.png Binary files differnew file mode 100644 index 000000000..13ed3d450 --- /dev/null +++ b/OpenPGP-Keychain-API-Demo/res/drawable-xhdpi/ic_launcher.png diff --git a/OpenPGP-Keychain-API-Demo/res/drawable-xhdpi/icon.png b/OpenPGP-Keychain-API-Demo/res/drawable-xhdpi/icon.png Binary files differdeleted file mode 100644 index 03ee31bbd..000000000 --- a/OpenPGP-Keychain-API-Demo/res/drawable-xhdpi/icon.png +++ /dev/null diff --git a/OpenPGP-Keychain-API-Demo/res/drawable-xxhdpi/ic_launcher.png b/OpenPGP-Keychain-API-Demo/res/drawable-xxhdpi/ic_launcher.png Binary files differnew file mode 100644 index 000000000..831c993d4 --- /dev/null +++ b/OpenPGP-Keychain-API-Demo/res/drawable-xxhdpi/ic_launcher.png diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java index 65e50599d..e1bd415be 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java @@ -788,7 +788,6 @@ public class PgpMain { } updateProgress(progress, R.string.progress_preparingStreams, 5, 100); - Log.d(Constants.TAG, "as"+symmetricEncryptionAlgorithm); // encrypt and compress input file content JcePGPDataEncryptorBuilder encryptorBuilder = new JcePGPDataEncryptorBuilder( symmetricEncryptionAlgorithm).setProvider(BOUNCY_CASTLE_PROVIDER_NAME) |