aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/res
diff options
context:
space:
mode:
Diffstat (limited to 'OpenPGP-Keychain/res')
-rw-r--r--OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml13
-rw-r--r--OpenPGP-Keychain/res/values/arrays.xml1
-rw-r--r--OpenPGP-Keychain/res/values/strings.xml1
3 files changed, 15 insertions, 0 deletions
diff --git a/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml
new file mode 100644
index 000000000..bb3b8a1cb
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal" >
+
+ <Button
+ android:id="@+id/import_clipboard_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/import_from_clipboard" />
+
+</LinearLayout> \ No newline at end of file
diff --git a/OpenPGP-Keychain/res/values/arrays.xml b/OpenPGP-Keychain/res/values/arrays.xml
index dc9de0f38..aca70c488 100644
--- a/OpenPGP-Keychain/res/values/arrays.xml
+++ b/OpenPGP-Keychain/res/values/arrays.xml
@@ -53,6 +53,7 @@
<item>@string/menu_importFromFile</item>
<item>@string/menu_keyServer</item>
<item>@string/menu_importFromQrCode</item>
+ <item>@string/import_from_clipboard</item>
<item>@string/menu_importFromNfc</item>
</string-array>
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index f8d1f6216..fb799cd14 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -351,6 +351,7 @@
<string name="import_import">Import selected keys</string>
<string name="import_sign_and_upload">Import, Sign, and upload selected keys</string>
<string name="import_finish">Finish</string>
+ <string name="import_from_clipboard">Import from Clipboard</string>
<!-- Intent labels -->
<string name="intent_decrypt_file">OpenPGP: Decrypt File</string>