aboutsummaryrefslogtreecommitdiffstats
path: root/APG/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-01-08 12:58:21 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2013-01-08 12:58:21 +0100
commit6cc7156fbd094265dddd66562941c90a2d9079d6 (patch)
tree6edab99d8798be03fa704013ff8b0be4ac4ddfe5 /APG/res
parent9758cb673f7db8c9a5e6951a1afadaaa85b787d6 (diff)
downloadopen-keychain-6cc7156fbd094265dddd66562941c90a2d9079d6.tar.gz
open-keychain-6cc7156fbd094265dddd66562941c90a2d9079d6.tar.bz2
open-keychain-6cc7156fbd094265dddd66562941c90a2d9079d6.zip
Share with NFC, Qr Code sharing refactored, Receiving NFC is not ready yet
Diffstat (limited to 'APG/res')
-rw-r--r--APG/res/layout/main.xml2
-rw-r--r--APG/res/layout/share_nfc_beam.xml14
-rw-r--r--APG/res/menu/nfc_beam.xml10
-rw-r--r--APG/res/raw/help_nfc_beam.html15
-rw-r--r--APG/res/raw/nfc_beam_share.html15
-rw-r--r--APG/res/values/strings.xml14
6 files changed, 64 insertions, 6 deletions
diff --git a/APG/res/layout/main.xml b/APG/res/layout/main.xml
index e4c509c70..66a334462 100644
--- a/APG/res/layout/main.xml
+++ b/APG/res/layout/main.xml
@@ -58,7 +58,7 @@
style="@style/DashboardButton"
android:drawableTop="@drawable/dashboard_scan_qrcode"
android:onClick="scanQrcodeOnClick"
- android:text="@string/dashboard_scan_qrcode" />
+ android:text="@string/dashboard_import_keys" />
<Button
android:id="@+id/dashboard_help"
diff --git a/APG/res/layout/share_nfc_beam.xml b/APG/res/layout/share_nfc_beam.xml
new file mode 100644
index 000000000..59e8e0844
--- /dev/null
+++ b/APG/res/layout/share_nfc_beam.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical" >
+
+ <net.nightwhistler.htmlspanner.JellyBeanSpanFixTextView
+ android:id="@+id/nfc_beam_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="16dp"
+ android:text="" />
+
+</ScrollView> \ No newline at end of file
diff --git a/APG/res/menu/nfc_beam.xml b/APG/res/menu/nfc_beam.xml
new file mode 100644
index 000000000..9cb86892d
--- /dev/null
+++ b/APG/res/menu/nfc_beam.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menu_settings"
+ android:icon="@drawable/ic_menu_settings"
+ android:showAsAction="always|withText"
+ android:title="@string/menu_BeamPreferences"/>
+
+</menu> \ No newline at end of file
diff --git a/APG/res/raw/help_nfc_beam.html b/APG/res/raw/help_nfc_beam.html
new file mode 100644
index 000000000..31abb7ddb
--- /dev/null
+++ b/APG/res/raw/help_nfc_beam.html
@@ -0,0 +1,15 @@
+<!-- Maintain structure with headings with h2 tags and content with p tags.
+This makes it easy to translate the values with transifex!
+And don't add newlines before or after p tags because of transifex -->
+<html>
+<head>
+</head>
+<body>
+<ol>
+<li>Go to your partners 'Manage Public Keyrings' and long press on the keyring you want to share.</li>
+<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li>
+<li>After it vibrates you’ll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
+<li>Tap the card and the content will then load on the other person’s device.</li>
+</ol>
+</body>
+</html> \ No newline at end of file
diff --git a/APG/res/raw/nfc_beam_share.html b/APG/res/raw/nfc_beam_share.html
new file mode 100644
index 000000000..734e69fc5
--- /dev/null
+++ b/APG/res/raw/nfc_beam_share.html
@@ -0,0 +1,15 @@
+<!-- Maintain structure with headings with h2 tags and content with p tags.
+This makes it easy to translate the values with transifex!
+And don't add newlines before or after p tags because of transifex -->
+<html>
+<head>
+</head>
+<body>
+<ol>
+<li>Make sure that NFC is turned on in Settings > More > NFC and make sure that Android Beam is also on in the same section.</li>
+<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li>
+<li>After it vibrates you’ll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
+<li>Tap the card and the content will then load on the other person’s device.</li>
+</ol>
+</body>
+</html> \ No newline at end of file
diff --git a/APG/res/values/strings.xml b/APG/res/values/strings.xml
index 709b6da0d..531e1cd68 100644
--- a/APG/res/values/strings.xml
+++ b/APG/res/values/strings.xml
@@ -45,10 +45,10 @@
<string name="title_keyServerQuery">Query Key Server</string>
<string name="title_sendKey">Export to Key Server</string>
<string name="title_unknownSignatureKey">Unknown Signature Key</string>
- <string name="title_importFromQRCode">Import from QR Code</string>
<string name="title_signKey">Sign Keyring</string>
<string name="title_about">About</string>
<string name="title_help">Help</string>
+ <string name="title_shareByNfc">Share keyring with NFC</string>
<!-- section_lowerCase: capitalized words, no punctuation -->
<string name="section_userIds">User IDs</string>
@@ -99,12 +99,14 @@
<string name="menu_editKey">Edit Keyring</string>
<string name="menu_search">Search</string>
<string name="menu_help">Help</string>
- <string name="menu_keyServer">Key Server</string>
+ <string name="menu_keyServer">Query Key Server</string>
<string name="menu_updateKey">Update from Server</string>
<string name="menu_exportKeyToServer">Export To Server</string>
- <string name="menu_share">Share public keyring with QR Code</string>
+ <string name="menu_shareQrCode">Share with QR Code</string>
+ <string name="menu_shareNfc">Share with NFC</string>
<string name="menu_scanQRCode">Scan QR Code</string>
<string name="menu_signKey">Sign Key</string>
+ <string name="menu_BeamPreferences">Beam Settings</string>
<!-- label_lowerCase: capitalized words, no punctuation -->
<string name="label_sign">Sign</string>
@@ -262,6 +264,8 @@
<string name="error_savingKeys">error saving some key(s)</string>
<string name="error_couldNotExtractPrivateKey">could not extract private key</string>
<string name="error_onlyFilesAreSupported">Direct binary data without actual file in filesystem is not supported. This is only supported by ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
+ <string name="error_jellyBeanNeeded">You need Android 4.1 alias Jelly Bean to use Androids NFC Beam feature!</string>
+ <string name="error_nfcNeeded">NFC is not available on your device!</string>
<!-- progress_lowerCase: lowercase, phrases, usually ending in '…' -->
<string name="progress_done">done.</string>
@@ -329,10 +333,11 @@
<string name="dashboard_encrypt">Encrypt</string>
<string name="dashboard_decrypt">Decrypt</string>
<string name="dashboard_help">Help</string>
- <string name="dashboard_scan_qrcode">Scan QRCode</string>
+ <string name="dashboard_import_keys">Import Keys</string>
<!-- Help -->
<string name="help_tab_start">Start</string>
+ <string name="help_tab_nfc_beam">NFC Beam</string>
<string name="help_tab_changelog">Changelog</string>
<string name="help_tab_about">About</string>
<string name="help_about_version">Version:</string>
@@ -340,7 +345,6 @@
<!-- Import from QR Code -->
<string name="import_from_qr_code_import">Import keyring (only locally)</string>
<string name="import_from_qr_code_import_sign_and_upload">Import, Sign, and upload keyring</string>
- <string name="import_from_qr_code_scan_again">Scan QR Code again</string>
<string name="import_from_qr_code_finish">Finish</string>
<!-- Intent labels -->
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 17:25:28 +0000