summaryrefslogtreecommitdiff
path: root/res/layout
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-10-26 14:43:43 +0200
committerArne Schwabe <arne@rfc2549.org>2012-10-26 14:43:43 +0200
commit4d966ce3ba862ccb3d45b66d3c5e24db157dca5c (patch)
tree56205bb2dcbe8173b66380bec84936db8d5215a7 /res/layout
parent86d9cc5eba96c51d5c2866b46afdb1d134563d0b (diff)
parentfd1dbd411e61ad12e79fab7d700782dd76135232 (diff)
Merge changes
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/faq.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/res/layout/faq.xml b/res/layout/faq.xml
index dc591318..c4fd57f0 100644
--- a/res/layout/faq.xml
+++ b/res/layout/faq.xml
@@ -34,6 +34,14 @@
<TextView
style="@style/faqhead"
+ android:text="@string/battery_consumption_title" />
+
+ <TextView
+ android:id="@+id/faq_battery"
+ style="@style/faqitem" />
+
+ <TextView
+ style="@style/faqhead"
android:text="@string/tap_mode" />
<TextView