From 6f09c971c0fe9eb0f03690bb3305164aa77c5a45 Mon Sep 17 00:00:00 2001
From: juloo
Date: Sat, 8 Aug 2015 22:24:19 +0200
Subject: SideBarPreference + Continuing settings

---
 res/values/arrays.xml  |  7 +++++++
 res/values/strings.xml | 12 ++++++++++--
 res/xml/settings.xml   | 29 +++++++++++++++++++++--------
 3 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 res/values/arrays.xml

(limited to 'res')

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
new file mode 100644
index 0000000..896c515
--- /dev/null
+++ b/res/values/arrays.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string-array name="pref_layout_values">
+		<item>azerty</item>
+		<item>qwerty</item>
+	</string-array>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e4629be..cc6169b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5,13 +5,21 @@
 	<string name="settings_activity_label">Keyboard 2.0 Settings</string>
 
 	<string name="pref_category_layout">Layout</string>
+	<string name="pref_layout_title">Change keyboard layout</string>
+	<string name="pref_layout_summary">%s</string>
+	<string-array name="pref_layout_entries">
+		<item>Azerty</item>
+		<item>Qwerty</item>
+	</string-array>
 
 	<string name="pref_category_typing">Typing</string>
+	<string name="pref_preci_title">Precision</string>
+	<string name="pref_preci_summary">Distance of corner values (%spx)</string>
 
 	<string name="pref_category_vibrate">Vibration</string>
-	<string name="pref_vibrate_text">Vibration</string>
+	<string name="pref_vibrate_title">Vibration</string>
 	<string name="pref_vibrate_summary">Enable/Disable vibrations</string>
-	<string name="pref_vibrate_duration_text">Duration</string>
+	<string name="pref_vibrate_duration_title">Duration</string>
 	<string name="pref_vibrate_duration_summary">Change vibrations duration</string>
 
 	<string name="pref_category_misc">Other</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index e92fb2b..7902527 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -1,23 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 	<PreferenceCategory android:title="@string/pref_category_layout">
-		<!-- Keyboard layout -->
+		<ListPreference
+			android:key="keyboard_layout"
+			android:title="@string/pref_layout_title"
+			android:summary="@string/pref_layout_summary"
+			android:defaultValue="azerty"
+			android:entries="@array/pref_layout_entries"
+			android:entryValues="@array/pref_layout_values" />
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/pref_category_typing">
-		<!-- Precision (SUB_VALUE_DIST) -->
-		<!-- Key repeat timeout (LONGPRESS_TIMEOUT) -->
-		<!-- Key repeat interval (LONGPRESS_INTERVAL) -->
+		<juloo.common.SlideBarPreference
+			android:key="sub_value_dist"
+			android:title="@string/pref_preci_title"
+			android:summary="@string/pref_preci_summary"
+			android:defaultValue="8.0"
+			min="5.0"
+			max="20.0"
+			/>
+		<!-- Precision (sub_value_dist) -->
+		<!-- Key repeat timeout (longpress_timeout) -->
+		<!-- Key repeat interval (longpress_interval) -->
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/pref_category_vibrate">
 		<CheckBoxPreference
 			android:key="vibrate_enabled"
-			android:title="@string/pref_vibrate_text"
+			android:title="@string/pref_vibrate_title"
 			android:summary="@string/pref_vibrate_summary"
 			android:defaultValue="true" />
-		<!-- Duration (VIBRATE_DURATION) -->
+		<!-- Duration (vibrate_duration) -->
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/pref_category_misc">
-		<!-- Keys height (_keyHeight) -->
-		<!-- Offset height (_marginBottom) -->
+		<!-- Offset height (margin_bottom) -->
 	</PreferenceCategory>
 </PreferenceScreen>
-- 
cgit v1.2.3