aboutsummaryrefslogtreecommitdiffstats
path: root/APG/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'APG/res/layout')
-rw-r--r--APG/res/layout/main.xml2
-rw-r--r--APG/res/layout/share_nfc_beam.xml14
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