cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Externalize all import actions into ImportKeysActivity

Browse Source
This commit is contained in:
Dominik Schürmann
2013-01-07 15:56:56 +01:00
parent 05778fd482
commit 9758cb673f
15 changed files with 665 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APG/res/layout/import_from_qr_code.xml → APG/res/layout/import_keys.xml
View File

@@ -27,13 +27,6 @@
android:onClick="signAndUploadOnClick"
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"

4
APG/res/values/strings.xml
View File

@@ -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>