From 2f81c2fb0f20bfc17e6e658047734f9063532269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 25 Oct 2013 21:46:05 +0200 Subject: spring-cleaning: remove unused resources, rename strings from camelCase to snake_case to follow standard practice --- OpenPGP-Keychain/AndroidManifest.xml | 22 +- OpenPGP-Keychain/res/drawable-hdpi/encrypted.png | Bin 3561 -> 0 bytes .../res/drawable-hdpi/encrypted_large.png | Bin 5244 -> 0 bytes .../res/drawable-hdpi/ic_menu_about.png | Bin 1764 -> 0 bytes .../res/drawable-hdpi/ic_menu_decrypt.png | Bin 1387 -> 0 bytes .../res/drawable-hdpi/ic_menu_encrypt.png | Bin 1384 -> 0 bytes .../res/drawable-hdpi/ic_menu_scan_qrcode.png | Bin 1762 -> 0 bytes OpenPGP-Keychain/res/drawable-hdpi/key.png | Bin 3675 -> 0 bytes OpenPGP-Keychain/res/drawable-hdpi/key_large.png | Bin 5550 -> 0 bytes OpenPGP-Keychain/res/drawable-hdpi/signed.png | Bin 3858 -> 0 bytes OpenPGP-Keychain/res/drawable-ldpi/encrypted.png | Bin 1513 -> 0 bytes .../res/drawable-ldpi/encrypted_large.png | Bin 2486 -> 0 bytes OpenPGP-Keychain/res/drawable-ldpi/key.png | Bin 1484 -> 0 bytes OpenPGP-Keychain/res/drawable-ldpi/key_large.png | Bin 2462 -> 0 bytes OpenPGP-Keychain/res/drawable-ldpi/signed.png | Bin 1576 -> 0 bytes OpenPGP-Keychain/res/drawable-mdpi/encrypted.png | Bin 2486 -> 0 bytes .../res/drawable-mdpi/encrypted_large.png | Bin 3561 -> 0 bytes .../res/drawable-mdpi/ic_menu_about.png | Bin 1441 -> 0 bytes .../res/drawable-mdpi/ic_menu_decrypt.png | Bin 1269 -> 0 bytes .../res/drawable-mdpi/ic_menu_encrypt.png | Bin 1263 -> 0 bytes .../res/drawable-mdpi/ic_menu_scan_qrcode.png | Bin 1460 -> 0 bytes OpenPGP-Keychain/res/drawable-mdpi/key.png | Bin 2462 -> 0 bytes OpenPGP-Keychain/res/drawable-mdpi/key_large.png | Bin 3675 -> 0 bytes OpenPGP-Keychain/res/drawable-mdpi/signed.png | Bin 2611 -> 0 bytes .../res/drawable-xhdpi/ic_menu_about.png | Bin 2257 -> 0 bytes .../res/drawable-xhdpi/ic_menu_decrypt.png | Bin 1542 -> 0 bytes .../res/drawable-xhdpi/ic_menu_encrypt.png | Bin 1542 -> 0 bytes .../res/drawable-xhdpi/ic_menu_scan_qrcode.png | Bin 2048 -> 0 bytes OpenPGP-Keychain/res/drawable/encrypted.png | Bin 2486 -> 0 bytes OpenPGP-Keychain/res/drawable/encrypted_large.png | Bin 3561 -> 0 bytes .../res/drawable/ic_launcher_folder.png | Bin 2235 -> 0 bytes .../res/drawable/ic_launcher_folder_small.png | Bin 1522 -> 0 bytes OpenPGP-Keychain/res/drawable/key.png | Bin 2462 -> 0 bytes OpenPGP-Keychain/res/drawable/key_large.png | Bin 3675 -> 0 bytes OpenPGP-Keychain/res/drawable/signed.png | Bin 2611 -> 0 bytes OpenPGP-Keychain/res/layout/account_item.xml | 35 - .../res/layout/api_app_settings_fragment.xml | 6 +- OpenPGP-Keychain/res/layout/create_key.xml | 4 +- OpenPGP-Keychain/res/layout/decrypt.xml | 2 +- OpenPGP-Keychain/res/layout/edit_key.xml | 6 +- OpenPGP-Keychain/res/layout/edit_key_key_item.xml | 2 +- .../res/layout/edit_key_user_id_item.xml | 2 +- OpenPGP-Keychain/res/layout/encrypt.xml | 14 +- OpenPGP-Keychain/res/layout/file_dialog.xml | 2 +- OpenPGP-Keychain/res/layout/filter_info.xml | 38 - OpenPGP-Keychain/res/layout/general.xml | 59 - OpenPGP-Keychain/res/layout/help_activity.xml | 9 +- .../res/layout/import_keys_file_fragment.xml | 2 +- .../res/layout/import_keys_keyserver_fragment.xml | 2 +- .../res/layout/import_keys_nfc_fragment.xml | 2 +- .../res/layout/import_keys_qr_code_fragment.xml | 2 +- .../res/layout/key_list_public_activity.xml | 2 +- .../res/layout/key_list_secret_activity.xml | 2 +- .../res/layout/key_server_query_layout.xml | 2 +- OpenPGP-Keychain/res/layout/passphrase.xml | 2 +- OpenPGP-Keychain/res/layout/passphrase_repeat.xml | 4 +- OpenPGP-Keychain/res/layout/sign_key_layout.xml | 2 +- OpenPGP-Keychain/res/menu/nfc_beam.xml | 2 +- OpenPGP-Keychain/res/values/arrays.xml | 8 +- OpenPGP-Keychain/res/values/static_strings.xml | 1 - OpenPGP-Keychain/res/values/strings.xml | 420 +- OpenPGP-Keychain/res/xml/preferences.xml | 16 +- .../res/xml/searchable_public_keys.xml | 2 +- .../res/xml/searchable_secret_keys.xml | 2 +- .../org/openintents/openpgp/IOpenPgpService.aidl | 29 +- .../keychain/helper/FileHelper.java | 4 +- .../sufficientlysecure/keychain/pgp/PgpHelper.java | 4 +- .../keychain/pgp/PgpImportExport.java | 10 +- .../keychain/pgp/PgpKeyHelper.java | 4 +- .../keychain/pgp/PgpKeyOperation.java | 26 +- .../keychain/pgp/PgpOperation.java | 74 +- .../keychain/service/KeychainIntentService.java | 10 +- .../service/KeychainIntentServiceHandler.java | 2 +- .../service/remote/AppSettingsFragment.java | 2 +- .../keychain/service/remote/OpenPgpService.java | 4 +- .../service/remote/RemoteServiceActivity.java | 2 +- .../keychain/ui/DecryptActivity.java | 30 +- .../keychain/ui/EditKeyActivity.java | 32 +- .../keychain/ui/EncryptActivity.java | 54 +- .../keychain/ui/HelpActivity.java | 2 + .../keychain/ui/ImportKeysActivity.java | 12 +- .../keychain/ui/ImportKeysListFragment.java | 2 +- .../keychain/ui/KeyListActivity.java | 18 +- .../keychain/ui/KeyListFragment.java | 6 +- .../keychain/ui/KeyListPublicActivity.java | 6 +- .../keychain/ui/KeyListPublicFragment.java | 10 +- .../keychain/ui/KeyListSecretActivity.java | 4 +- .../keychain/ui/KeyListSecretFragment.java | 2 +- .../keychain/ui/KeyServerQueryActivity.java | 6 +- .../keychain/ui/KeyServerUploadActivity.java | 2 +- .../keychain/ui/MainActivity.java | 2 +- .../keychain/ui/PreferencesActivity.java | 12 +- .../keychain/ui/PreferencesKeyServerActivity.java | 4 +- .../keychain/ui/SelectPublicKeyActivity.java | 2 +- .../keychain/ui/SelectPublicKeyFragment.java | 2 +- .../keychain/ui/SelectSecretKeyFragment.java | 2 +- .../keychain/ui/ShareActivity.java | 2 +- .../keychain/ui/ShareNfcBeamActivity.java | 6 +- .../keychain/ui/SignKeyActivity.java | 4 +- .../keychain/ui/adapter/ImportKeysAdapter.java | 6 +- .../keychain/ui/adapter/KeyListAdapter.java | 4 +- .../ui/adapter/SelectKeyCursorAdapter.java | 12 +- .../ui/dialog/DeleteFileDialogFragment.java | 6 +- .../ui/dialog/DeleteKeyDialogFragment.java | 6 +- .../ui/dialog/LookupUnknownKeyDialogFragment.java | 4 +- .../ui/dialog/PassphraseDialogFragment.java | 14 +- .../ui/dialog/SetPassphraseDialogFragment.java | 10 +- .../ui/dialog/ShareQrCodeDialogFragment.java | 2 +- .../keychain/ui/widget/KeyEditor.java | 14 +- .../keychain/ui/widget/SectionView.java | 4 +- .../keychain/ui/widget/UserIdEditor.java | 2 +- .../keychain/util/AlgorithmNames.java | 8 +- Resources/AndroidUnusedResources1.6.2.jar | Bin 0 -> 35221 bytes Resources/Graphics/dashboard_decrypt_default.svg | 814 +++ Resources/Graphics/dashboard_decrypt_pressed.svg | 1178 +++ Resources/Graphics/dashboard_encrypt_default.svg | 585 ++ Resources/Graphics/dashboard_encrypt_pressed.svg | 949 +++ Resources/Graphics/dashboard_help_default.svg | 266 + Resources/Graphics/dashboard_help_pressed.svg | 403 ++ Resources/Graphics/dashboard_import_default.svg | 7117 ++++++++++++++++++ Resources/Graphics/dashboard_import_pressed.svg | 7632 ++++++++++++++++++++ .../Graphics/dashboard_manage_keys_default.svg | 2748 +++++++ .../Graphics/dashboard_manage_keys_pressed.svg | 3406 +++++++++ Resources/Graphics/dashboard_my_keys_default.svg | 689 ++ Resources/Graphics/dashboard_my_keys_pressed.svg | 1024 +++ .../Graphics/dashboard_scan_qrcode_default.svg | 1672 +++++ .../Graphics/dashboard_scan_qrcode_pressed.svg | 1698 +++++ Resources/Graphics/icon.svg | 3546 +++++++++ Resources/Graphics/icon_google_play.png | Bin 0 -> 81207 bytes Resources/Graphics/icon_googlecode.png | Bin 0 -> 3643 bytes Resources/Graphics/icon_sizes.txt | 30 + Resources/Graphics/key.svg | 111 + Resources/Graphics/kgpg_key2_kopete.svgz | Bin 0 -> 36830 bytes Resources/Screenshots/screenshot1.png | Bin 0 -> 35361 bytes Resources/Screenshots/screenshot2.png | Bin 0 -> 27660 bytes Resources/Screenshots/screenshot3.png | Bin 0 -> 26405 bytes Resources/Screenshots/screenshot4.png | Bin 0 -> 30530 bytes Resources/Screenshots/screenshot5.png | Bin 0 -> 22315 bytes Resources/dashboard_decrypt_default.svg | 814 --- Resources/dashboard_decrypt_pressed.svg | 1178 --- Resources/dashboard_encrypt_default.svg | 585 -- Resources/dashboard_encrypt_pressed.svg | 949 --- Resources/dashboard_help_default.svg | 266 - Resources/dashboard_help_pressed.svg | 403 -- Resources/dashboard_import_default.svg | 7117 ------------------ Resources/dashboard_import_pressed.svg | 7632 -------------------- Resources/dashboard_manage_keys_default.svg | 2748 ------- Resources/dashboard_manage_keys_pressed.svg | 3406 --------- Resources/dashboard_my_keys_default.svg | 689 -- Resources/dashboard_my_keys_pressed.svg | 1024 --- Resources/dashboard_scan_qrcode_default.svg | 1672 ----- Resources/dashboard_scan_qrcode_pressed.svg | 1698 ----- Resources/gfa_20120227.pdf | 6816 ----------------- Resources/icon.svg | 3546 --------- Resources/icon_google_play.png | Bin 81207 -> 0 bytes Resources/icon_googlecode.png | Bin 3643 -> 0 bytes Resources/icon_sizes.txt | 30 - Resources/key.svg | 111 - Resources/kgpg_key2_kopete.svgz | Bin 36830 -> 0 bytes Resources/old values/values-da/strings.xml | 261 - Resources/old values/values-de/strings.xml | 269 - Resources/old values/values-es/strings.xml | 303 - Resources/old values/values-it/strings.xml | 314 - Resources/old values/values-no/strings.xml | 313 - Resources/old values/values-pt/strings.xml | 312 - Resources/old values/values-sl/strings.xml | 304 - Resources/old values/values-zh/strings.xml | 309 - Resources/screenshot1.png | Bin 35361 -> 0 bytes Resources/screenshot2.png | Bin 27660 -> 0 bytes Resources/screenshot3.png | Bin 26405 -> 0 bytes Resources/screenshot4.png | Bin 30530 -> 0 bytes Resources/screenshot5.png | Bin 22315 -> 0 bytes 172 files changed, 34360 insertions(+), 43736 deletions(-) delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi/encrypted.png delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi/encrypted_large.png delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi/ic_menu_about.png delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi/ic_menu_decrypt.png delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi/ic_menu_encrypt.png delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi/ic_menu_scan_qrcode.png delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi/key.png delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi/key_large.png delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi/signed.png delete mode 100644 OpenPGP-Keychain/res/drawable-ldpi/encrypted.png delete mode 100644 OpenPGP-Keychain/res/drawable-ldpi/encrypted_large.png delete mode 100644 OpenPGP-Keychain/res/drawable-ldpi/key.png delete mode 100644 OpenPGP-Keychain/res/drawable-ldpi/key_large.png delete mode 100644 OpenPGP-Keychain/res/drawable-ldpi/signed.png delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi/encrypted.png delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi/encrypted_large.png delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi/ic_menu_about.png delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi/ic_menu_decrypt.png delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi/ic_menu_encrypt.png delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi/ic_menu_scan_qrcode.png delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi/key.png delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi/key_large.png delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi/signed.png delete mode 100644 OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_about.png delete mode 100644 OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_decrypt.png delete mode 100644 OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_encrypt.png delete mode 100644 OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_scan_qrcode.png delete mode 100644 OpenPGP-Keychain/res/drawable/encrypted.png delete mode 100644 OpenPGP-Keychain/res/drawable/encrypted_large.png delete mode 100644 OpenPGP-Keychain/res/drawable/ic_launcher_folder.png delete mode 100644 OpenPGP-Keychain/res/drawable/ic_launcher_folder_small.png delete mode 100644 OpenPGP-Keychain/res/drawable/key.png delete mode 100644 OpenPGP-Keychain/res/drawable/key_large.png delete mode 100644 OpenPGP-Keychain/res/drawable/signed.png delete mode 100644 OpenPGP-Keychain/res/layout/account_item.xml delete mode 100644 OpenPGP-Keychain/res/layout/filter_info.xml delete mode 100644 OpenPGP-Keychain/res/layout/general.xml create mode 100644 Resources/AndroidUnusedResources1.6.2.jar create mode 100644 Resources/Graphics/dashboard_decrypt_default.svg create mode 100644 Resources/Graphics/dashboard_decrypt_pressed.svg create mode 100644 Resources/Graphics/dashboard_encrypt_default.svg create mode 100644 Resources/Graphics/dashboard_encrypt_pressed.svg create mode 100755 Resources/Graphics/dashboard_help_default.svg create mode 100644 Resources/Graphics/dashboard_help_pressed.svg create mode 100644 Resources/Graphics/dashboard_import_default.svg create mode 100644 Resources/Graphics/dashboard_import_pressed.svg create mode 100644 Resources/Graphics/dashboard_manage_keys_default.svg create mode 100644 Resources/Graphics/dashboard_manage_keys_pressed.svg create mode 100644 Resources/Graphics/dashboard_my_keys_default.svg create mode 100644 Resources/Graphics/dashboard_my_keys_pressed.svg create mode 100644 Resources/Graphics/dashboard_scan_qrcode_default.svg create mode 100644 Resources/Graphics/dashboard_scan_qrcode_pressed.svg create mode 100644 Resources/Graphics/icon.svg create mode 100644 Resources/Graphics/icon_google_play.png create mode 100644 Resources/Graphics/icon_googlecode.png create mode 100644 Resources/Graphics/icon_sizes.txt create mode 100644 Resources/Graphics/key.svg create mode 100644 Resources/Graphics/kgpg_key2_kopete.svgz create mode 100644 Resources/Screenshots/screenshot1.png create mode 100644 Resources/Screenshots/screenshot2.png create mode 100644 Resources/Screenshots/screenshot3.png create mode 100644 Resources/Screenshots/screenshot4.png create mode 100644 Resources/Screenshots/screenshot5.png delete mode 100644 Resources/dashboard_decrypt_default.svg delete mode 100644 Resources/dashboard_decrypt_pressed.svg delete mode 100644 Resources/dashboard_encrypt_default.svg delete mode 100644 Resources/dashboard_encrypt_pressed.svg delete mode 100755 Resources/dashboard_help_default.svg delete mode 100644 Resources/dashboard_help_pressed.svg delete mode 100644 Resources/dashboard_import_default.svg delete mode 100644 Resources/dashboard_import_pressed.svg delete mode 100644 Resources/dashboard_manage_keys_default.svg delete mode 100644 Resources/dashboard_manage_keys_pressed.svg delete mode 100644 Resources/dashboard_my_keys_default.svg delete mode 100644 Resources/dashboard_my_keys_pressed.svg delete mode 100644 Resources/dashboard_scan_qrcode_default.svg delete mode 100644 Resources/dashboard_scan_qrcode_pressed.svg delete mode 100644 Resources/gfa_20120227.pdf delete mode 100644 Resources/icon.svg delete mode 100644 Resources/icon_google_play.png delete mode 100644 Resources/icon_googlecode.png delete mode 100644 Resources/icon_sizes.txt delete mode 100644 Resources/key.svg delete mode 100644 Resources/kgpg_key2_kopete.svgz delete mode 100644 Resources/old values/values-da/strings.xml delete mode 100644 Resources/old values/values-de/strings.xml delete mode 100644 Resources/old values/values-es/strings.xml delete mode 100644 Resources/old values/values-it/strings.xml delete mode 100644 Resources/old values/values-no/strings.xml delete mode 100644 Resources/old values/values-pt/strings.xml delete mode 100644 Resources/old values/values-sl/strings.xml delete mode 100644 Resources/old values/values-zh/strings.xml delete mode 100644 Resources/screenshot1.png delete mode 100644 Resources/screenshot2.png delete mode 100644 Resources/screenshot3.png delete mode 100644 Resources/screenshot4.png delete mode 100644 Resources/screenshot5.png diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml index cee186daf..ca203c1f2 100644 --- a/OpenPGP-Keychain/AndroidManifest.xml +++ b/OpenPGP-Keychain/AndroidManifest.xml @@ -88,7 +88,7 @@ @@ -104,7 +104,7 @@ @@ -120,13 +120,13 @@ @@ -142,7 +142,7 @@ @@ -248,11 +248,11 @@ + android:label="@string/title_key_server_query" /> + android:label="@string/title_send_key" /> + android:label="@string/title_sign_key" /> @@ -332,7 +332,7 @@ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/encrypted.png b/OpenPGP-Keychain/res/drawable-hdpi/encrypted.png deleted file mode 100644 index 541781cd1..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/encrypted.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/encrypted_large.png b/OpenPGP-Keychain/res/drawable-hdpi/encrypted_large.png deleted file mode 100644 index 209278377..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/encrypted_large.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_about.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_about.png deleted file mode 100644 index 8f39c428a..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_about.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_decrypt.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_decrypt.png deleted file mode 100644 index 6b98ad50c..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_decrypt.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_encrypt.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_encrypt.png deleted file mode 100644 index 58689b43a..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_encrypt.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_scan_qrcode.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_scan_qrcode.png deleted file mode 100644 index b119b1999..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_scan_qrcode.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/key.png b/OpenPGP-Keychain/res/drawable-hdpi/key.png deleted file mode 100644 index af4742ec0..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/key.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/key_large.png b/OpenPGP-Keychain/res/drawable-hdpi/key_large.png deleted file mode 100644 index 590f7d5a4..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/key_large.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/signed.png b/OpenPGP-Keychain/res/drawable-hdpi/signed.png deleted file mode 100644 index ab9495e7b..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/signed.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-ldpi/encrypted.png b/OpenPGP-Keychain/res/drawable-ldpi/encrypted.png deleted file mode 100644 index bcd8cfc8e..000000000 Binary files a/OpenPGP-Keychain/res/drawable-ldpi/encrypted.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-ldpi/encrypted_large.png b/OpenPGP-Keychain/res/drawable-ldpi/encrypted_large.png deleted file mode 100644 index 34c3d3f97..000000000 Binary files a/OpenPGP-Keychain/res/drawable-ldpi/encrypted_large.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-ldpi/key.png b/OpenPGP-Keychain/res/drawable-ldpi/key.png deleted file mode 100644 index c806b6041..000000000 Binary files a/OpenPGP-Keychain/res/drawable-ldpi/key.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-ldpi/key_large.png b/OpenPGP-Keychain/res/drawable-ldpi/key_large.png deleted file mode 100644 index aa499a5e1..000000000 Binary files a/OpenPGP-Keychain/res/drawable-ldpi/key_large.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-ldpi/signed.png b/OpenPGP-Keychain/res/drawable-ldpi/signed.png deleted file mode 100644 index 4202c3f97..000000000 Binary files a/OpenPGP-Keychain/res/drawable-ldpi/signed.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/encrypted.png b/OpenPGP-Keychain/res/drawable-mdpi/encrypted.png deleted file mode 100644 index 34c3d3f97..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/encrypted.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/encrypted_large.png b/OpenPGP-Keychain/res/drawable-mdpi/encrypted_large.png deleted file mode 100644 index 541781cd1..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/encrypted_large.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_about.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_about.png deleted file mode 100644 index 7c57436fc..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_about.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_decrypt.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_decrypt.png deleted file mode 100644 index 84557bbee..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_decrypt.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_encrypt.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_encrypt.png deleted file mode 100644 index 4ee0de4af..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_encrypt.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_scan_qrcode.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_scan_qrcode.png deleted file mode 100644 index 08fb51400..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_scan_qrcode.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/key.png b/OpenPGP-Keychain/res/drawable-mdpi/key.png deleted file mode 100644 index aa499a5e1..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/key.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/key_large.png b/OpenPGP-Keychain/res/drawable-mdpi/key_large.png deleted file mode 100644 index af4742ec0..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/key_large.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/signed.png b/OpenPGP-Keychain/res/drawable-mdpi/signed.png deleted file mode 100644 index d2917644c..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/signed.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_about.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_about.png deleted file mode 100644 index 2641f142a..000000000 Binary files a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_about.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_decrypt.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_decrypt.png deleted file mode 100644 index 23ee08bee..000000000 Binary files a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_decrypt.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_encrypt.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_encrypt.png deleted file mode 100644 index 04562f33a..000000000 Binary files a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_encrypt.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_scan_qrcode.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_scan_qrcode.png deleted file mode 100644 index 015e6c6a1..000000000 Binary files a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_scan_qrcode.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable/encrypted.png b/OpenPGP-Keychain/res/drawable/encrypted.png deleted file mode 100644 index 2783804bc..000000000 Binary files a/OpenPGP-Keychain/res/drawable/encrypted.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable/encrypted_large.png b/OpenPGP-Keychain/res/drawable/encrypted_large.png deleted file mode 100644 index 6d7c616a4..000000000 Binary files a/OpenPGP-Keychain/res/drawable/encrypted_large.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable/ic_launcher_folder.png b/OpenPGP-Keychain/res/drawable/ic_launcher_folder.png deleted file mode 100644 index ed31ba580..000000000 Binary files a/OpenPGP-Keychain/res/drawable/ic_launcher_folder.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable/ic_launcher_folder_small.png b/OpenPGP-Keychain/res/drawable/ic_launcher_folder_small.png deleted file mode 100644 index 5df8d60f0..000000000 Binary files a/OpenPGP-Keychain/res/drawable/ic_launcher_folder_small.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable/key.png b/OpenPGP-Keychain/res/drawable/key.png deleted file mode 100644 index de7e72524..000000000 Binary files a/OpenPGP-Keychain/res/drawable/key.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable/key_large.png b/OpenPGP-Keychain/res/drawable/key_large.png deleted file mode 100644 index 6f18c0240..000000000 Binary files a/OpenPGP-Keychain/res/drawable/key_large.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable/signed.png b/OpenPGP-Keychain/res/drawable/signed.png deleted file mode 100644 index 490e94fbd..000000000 Binary files a/OpenPGP-Keychain/res/drawable/signed.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/layout/account_item.xml b/OpenPGP-Keychain/res/layout/account_item.xml deleted file mode 100644 index 0aa76719a..000000000 --- a/OpenPGP-Keychain/res/layout/account_item.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml index 45dd11252..81b48be72 100644 --- a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml +++ b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml @@ -88,7 +88,7 @@ + android:text="@string/key_creation_el_gamal_info" /> @@ -56,7 +56,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:padding="4dp" - android:text="@string/label_keySize" /> + android:text="@string/label_key_size" /> + android:text="@string/label_delete_after_decryption" /> diff --git a/OpenPGP-Keychain/res/layout/edit_key.xml b/OpenPGP-Keychain/res/layout/edit_key.xml index 3ab5f1c52..20cc9f2ac 100644 --- a/OpenPGP-Keychain/res/layout/edit_key.xml +++ b/OpenPGP-Keychain/res/layout/edit_key.xml @@ -33,20 +33,20 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="4dp" - android:text="@string/label_passPhrase" /> + android:text="@string/label_passphrase" /> + android:text="@string/label_no_passphrase" />