diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-01-08 12:58:21 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-01-08 12:58:21 +0100 |
| commit | 6cc7156fbd094265dddd66562941c90a2d9079d6 (patch) | |
| tree | 6edab99d8798be03fa704013ff8b0be4ac4ddfe5 /APG/res/layout | |
| parent | 9758cb673f7db8c9a5e6951a1afadaaa85b787d6 (diff) | |
| download | open-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/layout')
| -rw-r--r-- | APG/res/layout/main.xml | 2 | ||||
| -rw-r--r-- | APG/res/layout/share_nfc_beam.xml | 14 |
2 files changed, 15 insertions, 1 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 |