From b187f57a026110ef0b0f1d6b6414c868922cab46 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 8 May 2012 16:34:47 +0200
Subject: Add FAQ Dialog, will be filled with more Items later

---
 res/layout/faq.xml | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 res/layout/faq.xml

(limited to 'res/layout')

diff --git a/res/layout/faq.xml b/res/layout/faq.xml
new file mode 100644
index 00000000..195acad8
--- /dev/null
+++ b/res/layout/faq.xml
@@ -0,0 +1,36 @@
+<?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/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
-- 
cgit v1.2.3


From efa217d83c1e899eb29910b1bff15b08cdb0be2e Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 8 May 2012 16:43:20 +0200
Subject: more todo, add Copying faq

---
 res/layout/faq.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'res/layout')

diff --git a/res/layout/faq.xml b/res/layout/faq.xml
index 195acad8..8cdf7326 100644
--- a/res/layout/faq.xml
+++ b/res/layout/faq.xml
@@ -16,6 +16,15 @@
             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" />
-- 
cgit v1.2.3


From 6d1e28f4e8a2b3c397936eb964e39463ca8b1ec7 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 8 May 2012 17:55:54 +0200
Subject: more about

---
 res/layout/about.xml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'res/layout')

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" />
-- 
cgit v1.2.3