Merge

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