diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-01-07 15:56:56 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-01-07 15:56:56 +0100 |
| commit | 9758cb673f7db8c9a5e6951a1afadaaa85b787d6 (patch) | |
| tree | eae4fb8739b2aa270bb7890a7a18546f5338a3a5 /APG/res | |
| parent | 05778fd4827fde2bd56686c2fa007adc00ba8176 (diff) | |
| download | open-keychain-9758cb673f7db8c9a5e6951a1afadaaa85b787d6.tar.gz open-keychain-9758cb673f7db8c9a5e6951a1afadaaa85b787d6.tar.bz2 open-keychain-9758cb673f7db8c9a5e6951a1afadaaa85b787d6.zip | |
Externalize all import actions into ImportKeysActivity
Diffstat (limited to 'APG/res')
| -rw-r--r-- | APG/res/layout/import_keys.xml (renamed from APG/res/layout/import_from_qr_code.xml) | 7 | ||||
| -rw-r--r-- | APG/res/values/strings.xml | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/APG/res/layout/import_from_qr_code.xml b/APG/res/layout/import_keys.xml index f20dbbb68..8e107cd96 100644 --- a/APG/res/layout/import_from_qr_code.xml +++ b/APG/res/layout/import_keys.xml @@ -28,13 +28,6 @@ android:text="@string/import_from_qr_code_import_sign_and_upload" /> <Button - android:id="@+id/import_from_qr_code_scan_again" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:onClick="scanAgainOnClick" - android:text="@string/import_from_qr_code_scan_again" /> - - <Button android:id="@+id/import_from_qr_code_finish" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/APG/res/values/strings.xml b/APG/res/values/strings.xml index 215905b3c..709b6da0d 100644 --- a/APG/res/values/strings.xml +++ b/APG/res/values/strings.xml @@ -89,7 +89,9 @@ <string name="menu_managePublicKeys">Manage Public Keyrings</string> <string name="menu_manageSecretKeys">Manage Secret Keyrings</string> <string name="menu_preferences">Settings</string> - <string name="menu_importKeys">Import Keyrings</string> + <string name="menu_importFromFile">Import from file</string> + <string name="menu_importFromQrCode">Import from QR Code</string> + <string name="menu_importFromNfc">Import from NFC</string> <string name="menu_exportKeys">Export All Keyrings</string> <string name="menu_exportKey">Export Keyring</string> <string name="menu_deleteKey">Delete Keyring</string> |