settings: moved touchkey settings into screen fragment

10 files changed, 35 insertions, 33 deletions

diff --git a/DeviceSettings/res/values-de/strings.xml b/DeviceSettings/res/values-de/strings.xml
index 4d0589e..54004a8 100644
--- a/DeviceSettings/res/values-de/strings.xml
+++ b/DeviceSettings/res/values-de/strings.xml
@@ -2,8 +2,8 @@
 <resources>
     <string name="app_name">Galaxy Note Einstellungen</string>
 
+    <string name="category_screen_title">Bildschirm</string>
     <string name="screen_colors_title">Farben</string>
-    <string name="category_mdnie_title">Bildschirm</string>
     <string name="mdnie_scenario_title_head">Szenario</string>
     <string name="mdnie_scenario_summary_head">Wähle das mDNIe Szenario</string>
     <string name="mdnie_mode_title_head">Modus</string>
diff --git a/DeviceSettings/res/values-es/strings.xml b/DeviceSettings/res/values-es/strings.xml
index feb29e9..02bff90 100644
--- a/DeviceSettings/res/values-es/strings.xml
+++ b/DeviceSettings/res/values-es/strings.xml
@@ -6,7 +6,7 @@
     <string name="hspa_title_head">HSPA</string>
     <string name="hspa_summary_head">Activar HSDPA/HSUPA</string>
 
-    <string name="category_mdnie_title">Pantalla</string>
+    <string name="category_screen_title">Pantalla</string>
     <string name="screen_colors_title">Colores</string>
     <string name="mdnie_scenario_title_head">Escenario</string>
     <string name="mdnie_scenario_summary_head">Establecer el escenario mDNIe</string>
diff --git a/DeviceSettings/res/values-fi/strings.xml b/DeviceSettings/res/values-fi/strings.xml
index 081f0ef..85b397f 100644
--- a/DeviceSettings/res/values-fi/strings.xml
+++ b/DeviceSettings/res/values-fi/strings.xml
@@ -2,8 +2,8 @@
 <resources>
     <string name="app_name">Galaxy Note-asetukset</string>
 
+    <string name="category_screen_title">Näyttö</string>
     <string name="screen_colors_title">Värit</string>
-    <string name="category_mdnie_title">Näyttö</string>
     <string name="mdnie_scenario_title_head">Skenaario</string>
     <string name="mdnie_scenario_summary_head">Vaihda mDNIe-skenaario</string>
     <string name="mdnie_mode_title_head">Tila</string>
diff --git a/DeviceSettings/res/values-fr/strings.xml b/DeviceSettings/res/values-fr/strings.xml
index ab81716..741356a 100644
--- a/DeviceSettings/res/values-fr/strings.xml
+++ b/DeviceSettings/res/values-fr/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="app_name">Paramètres Galaxy Note</string>
 
-    <string name="category_mdnie_title">Ecran</string>
+    <string name="category_screen_title">Ecran</string>
     <string name="screen_colors_title">Couleurs</string>
     <string name="mdnie_scenario_title_head">Scénario</string>
     <string name="mdnie_scenario_summary_head">Définit le scénario mDNIe</string>
diff --git a/DeviceSettings/res/values-hu/strings.xml b/DeviceSettings/res/values-hu/strings.xml
index 6a24926..8df2fe5 100644
--- a/DeviceSettings/res/values-hu/strings.xml
+++ b/DeviceSettings/res/values-hu/strings.xml
@@ -2,8 +2,8 @@
 <resources>
     <string name="app_name">Galaxy Note Beállítások</string>
 
+    <string name="category_screen_title">Kijelző</string>
     <string name="screen_colors_title">Színek</string>
-    <string name="category_mdnie_title">Kijelző</string>
     <string name="mdnie_scenario_title_head">Megjelenítés</string>
     <string name="mdnie_scenario_summary_head">mDNIe megjelenítési beállítások</string>
     <string name="mdnie_mode_title_head">Üzemmód</string>
diff --git a/DeviceSettings/res/values-nl/strings.xml b/DeviceSettings/res/values-nl/strings.xml
index 587b923..bb9372d 100644
--- a/DeviceSettings/res/values-nl/strings.xml
+++ b/DeviceSettings/res/values-nl/strings.xml
@@ -2,8 +2,8 @@
 <resources>
     <string name="app_name">Galaxy Note-instellingen</string>
 
+    <string name="category_screen_title">Scherm</string>
     <string name="screen_colors_title">Kleuren</string>
-    <string name="category_mdnie_title">Scherm</string>
     <string name="mdnie_scenario_title_head">Scenario</string>
     <string name="mdnie_scenario_summary_head">mDNIe-scenario instellen</string>
     <string name="mdnie_mode_title_head">Modus</string>
diff --git a/DeviceSettings/res/values-pt-rBR/strings.xml b/DeviceSettings/res/values-pt-rBR/strings.xml
index dad0f2c..dd52ffd 100755
--- a/DeviceSettings/res/values-pt-rBR/strings.xml
+++ b/DeviceSettings/res/values-pt-rBR/strings.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Config. Galaxy Note</string>
+
+    <string name="category_screen_title">Tela</string>
     <string name="screen_colors_title">Cores</string>
-    <string name="category_mdnie_title">Tela</string>
     <string name="mdnie_scenario_title_head">Cenário</string>
     <string name="mdnie_scenario_summary_head">Define o Cenário mDNIe</string>
     <string name="mdnie_mode_title_head">Modo</string>
diff --git a/DeviceSettings/res/values/strings.xml b/DeviceSettings/res/values/strings.xml
index 43d1dbf..72b8e86 100644
--- a/DeviceSettings/res/values/strings.xml
+++ b/DeviceSettings/res/values/strings.xml
@@ -2,8 +2,8 @@
 <resources>
     <string name="app_name">Galaxy Note Settings</string>
 
+    <string name="category_screen_title">Screen</string>
     <string name="screen_colors_title">Colors</string>
-    <string name="category_mdnie_title">Screen</string>
     <string name="mdnie_scenario_title_head">Scenario</string>
     <string name="mdnie_scenario_summary_head">Set the mDNIe Scenario</string>
     <string name="mdnie_mode_title_head">Mode</string>
@@ -18,18 +18,19 @@
     <string name="touchscreen_subcat_title">Touchscreen</string>
     <string name="touchscreen_sensitivity_title_head">Touch sensitivity</string>
     <string name="touchscreen_sensitivity_summary_head">Set touch panel sensitivity</string>
-    
+
+    <string name="touchkey_subcat_title">Touchkeys</string>
+    <string name="touchkey_light_title_head">Enable keys backlight</string>
+    <string name="touchkey_light_summary_head">Light up touchkeys when screen is on</string> 
+    <string name="touchkey_timeout_title_head">Backlight timeout</string>
+    <string name="touchkey_timeout_summary_head">Delay after a keypress before backlight turns off</string>
+
     <string name="category_sensors_title">Sensors</string>
     <string name="gyro_subcat_title">Gyroscope</string>
     <string name="use_gyro_calibration_title_head">Use calibration data</string>
     <string name="use_gyro_calibration_summary_head">Use the gyroscope calibration values. Do a calibration after checking this!</string>
     <string name="calibrate_gyro_title_head">Calibrate</string>
     <string name="calibrate_gyro_summary_head">Put your phone on a flat surface, and press this to calibrate</string>
-    <string name="touchkey_subcat_title">Touch key</string>
-    <string name="touchkey_light_title_head">Enable keys backlight</string>
-    <string name="touchkey_light_summary_head">Light up touch keys when screen is on</string> 
-    <string name="touchkey_timeout_title_head">Backlight timeout</string>
-    <string name="touchkey_timeout_summary_head">Delay after a keypress before backlight turns off</string>
 
     <string name="category_haptic_title">Haptic</string>
     <string name="vibrator_subcat_title">Vibrator</string>
diff --git a/DeviceSettings/res/xml/mdnie_preferences.xml b/DeviceSettings/res/xml/screen_preferences.xml
index f433418..d053bbd 100644
--- a/DeviceSettings/res/xml/mdnie_preferences.xml
+++ b/DeviceSettings/res/xml/screen_preferences.xml
@@ -61,4 +61,23 @@
                 android:entryValues="@array/touchscreen_sensitivity_entries_values"
                 android:defaultValue="50" />
     </PreferenceCategory>
+
+    <PreferenceCategory
+                android:title="@string/touchkey_subcat_title">
+    <!-- Touchkey backlight -->
+    <CheckBoxPreference
+                android:key="touchkey_light"
+                android:title="@string/touchkey_light_title_head"
+                android:summary="@string/touchkey_light_summary_head"
+                android:defaultValue="true"
+                />
+    <com.cyanogenmod.settings.device.TouchkeyTimeout
+                android:key="touchkey_timeout"
+                android:title="@string/touchkey_timeout_title_head"
+                android:summary="@string/touchkey_timeout_summary_head"
+                android:entries="@array/touchkey_timeout_entries"
+                android:entryValues="@array/touchkey_timeout_entries_values"
+                android:defaultValue="3"
+                />
+    </PreferenceCategory>
 </PreferenceScreen>
diff --git a/DeviceSettings/res/xml/sensors_preferences.xml b/DeviceSettings/res/xml/sensors_preferences.xml
index 497587d..bdce970 100644
--- a/DeviceSettings/res/xml/sensors_preferences.xml
+++ b/DeviceSettings/res/xml/sensors_preferences.xml
@@ -16,24 +16,5 @@
                 android:summary="@string/calibrate_gyro_summary_head"
                 />
     </PreferenceCategory>
-
-    <PreferenceCategory
-                android:title="@string/touchkey_subcat_title">
-    <!-- Touchkey backlight -->
-    <CheckBoxPreference
-                android:key="touchkey_light"
-                android:title="@string/touchkey_light_title_head"
-                android:summary="@string/touchkey_light_summary_head"
-                android:defaultValue="true"
-                />
-    <com.cyanogenmod.settings.device.TouchkeyTimeout
-                android:key="touchkey_timeout"
-                android:title="@string/touchkey_timeout_title_head"
-                android:summary="@string/touchkey_timeout_summary_head"
-                android:entries="@array/touchkey_timeout_entries"
-                android:entryValues="@array/touchkey_timeout_entries_values"
-                android:defaultValue="3"
-                />
-    </PreferenceCategory>
 </PreferenceScreen>