summaryrefslogtreecommitdiff
path: root/res/layout
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-05-09 02:11:34 +0200
committerArne Schwabe <arne@rfc2549.org>2012-05-09 02:11:34 +0200
commite689637b7c3555c464f800f049fe4059b908ca27 (patch)
tree01feed96bd0559c660ec5ce45945c019c198d1a5 /res/layout
parentb2b46c1867bd7282c91f43e80e0763f86ec791d4 (diff)
parent6dc0a6c39024a9a6931b85f72d099072e1473595 (diff)
Merge
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/about.xml17
-rw-r--r--res/layout/faq.xml45
2 files changed, 60 insertions, 2 deletions
diff --git a/res/layout/about.xml b/res/layout/about.xml
index f8f10a2a..a66a0cc9 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -13,12 +13,25 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/version" />
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="10sp" />
+
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/copyright_blinktgui" />
-
+ android:text="@string/copyright_blinktgui"
+ android:autoLink="all" />
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="10sp" />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/copyright_guicode"
+ android:autoLink="all" />
+
<Space
android:layout_width="match_parent"
android:layout_height="20sp" />
diff --git a/res/layout/faq.xml b/res/layout/faq.xml
new file mode 100644
index 00000000..8cdf7326
--- /dev/null
+++ b/res/layout/faq.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" >
+
+ <TextView
+ style="@style/faqhead"
+ android:text="@string/tap_mode" />
+
+ <TextView
+ style="@style/faqitem"
+ android:text="@string/faq_tap_mode" />
+
+ <TextView
+ style="@style/faqhead"
+ android:text="@string/copying_log_entries" />
+
+ <TextView
+ style="@style/faqitem"
+ android:text="@string/faq_copying"/>
+
+
+ <TextView
+ style="@style/faqhead"
+ android:text="@string/tap_mode" />
+
+ <TextView
+ style="@style/faqitem"
+ android:text="@string/tap_faq2" />
+
+ <TextView
+ style="@style/faqhead"
+ android:text="@string/tap_mode" />
+
+ <TextView
+ style="@style/faqitem"
+ android:text="@string/tap_faq3" />
+ </LinearLayout>
+
+</ScrollView> \ No newline at end of file