i9300: advanced settings: pimp my vibrator

Change-Id: I1f53f511c0afcf60a8063935ad9f8e3f05a61137

3 files changed, 71 insertions, 53 deletions

diff --git a/DeviceSettings/res/values/arrays.xml b/DeviceSettings/res/values/arrays.xml
index d82ffbc..8e99c95 100644
--- a/DeviceSettings/res/values/arrays.xml
+++ b/DeviceSettings/res/values/arrays.xml
@@ -1,33 +1,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string-array name="vibrator_intensity_entries">
-        <item>0%</item>
-        <item>25%</item>
-        <item>50% (Default)</item>
-        <item>75%</item>
-        <item>100%</item>
-    </string-array>
-
-    <string-array name="vibrator_intensity_entries_values" translatable="false">
-        <item>0</item>
-        <item>25</item>
-        <item>50</item>
-        <item>75</item>
-        <item>100</item>
-    </string-array>
-
-    <string-array name="hspa_entries">
-	    <item>UMTS Only</item>
-	    <item>HSDPA Only</item>
-	    <item>HSDPA + HSUPA</item>
-    </string-array>
-
-    <string-array name="hspa_entries_values" translatable="false">
-	    <item>21</item>
-        <item>22</item>
-        <item>23</item>
-    </string-array>
-
     <string-array name="mdnie_scenario_entries">
         <item>CyanogenMod (Default)</item>
         <item>UI</item>
@@ -76,16 +48,6 @@
         <item>1</item>
     </string-array>
 
-    <string-array name="led_fade_entries">
-        <item>Blinking</item>
-        <item>Fading</item>
-    </string-array>
-
-    <string-array name="led_fade_entries_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-
     <string-array name="touchkey_timeout_entries">
         <item>Never</item>
         <item>1 second</item>
@@ -106,4 +68,26 @@
         <item>6</item>
     </string-array>
 
+    <string-array name="led_fade_entries">
+        <item>Blinking</item>
+        <item>Fading</item>
+    </string-array>
+
+    <string-array name="led_fade_entries_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
+    <string-array name="hspa_entries">
+	    <item>UMTS Only</item>
+	    <item>HSDPA Only</item>
+	    <item>HSDPA + HSUPA</item>
+    </string-array>
+
+    <string-array name="hspa_entries_values" translatable="false">
+	    <item>21</item>
+        <item>22</item>
+        <item>23</item>
+    </string-array>
+
 </resources>
diff --git a/DeviceSettings/res/values/config.xml b/DeviceSettings/res/values/config.xml
new file mode 100644
index 0000000..5667f97
--- /dev/null
+++ b/DeviceSettings/res/values/config.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Vibrator Tuning -->
+    <bool name="has_vibrator_tuning">true</bool>
+    <string name="vibrator_sysfs_file">"/sys/vibrator/pwm_val"</string>
+    <string name="intensity_max_value">100</string>
+    <string name="intensity_warning_threshold">75</string>
+    <string name="intensity_default_value">50</string>
+    <string name="intensity_min_value">0</string>
+
+</resources>
diff --git a/DeviceSettings/res/values/strings.xml b/DeviceSettings/res/values/strings.xml
index 1bf9807..155e9c2 100644
--- a/DeviceSettings/res/values/strings.xml
+++ b/DeviceSettings/res/values/strings.xml
@@ -2,11 +2,13 @@
 <resources>
     <string name="app_name">Advanced settings</string>
 
-    <!-- Screen -->
+    <string name="defaults_button">Reset to default</string>
+
+    <!-- Screen Preference -->
     <string name="category_screen_title">Screen</string>
-    <string name="mdnie_subcat_title">Colors</string>
+    <string name="screen_colors_title">Colors</string>
 
-    <!-- CABC -->
+    <!-- Content adaptive backlight control -->
     <string name="cabc_title_head">CABC</string>
     <string name="cabc_summary_head">Enable content adaptive backlight control</string>
 
@@ -23,7 +25,7 @@
     <string name="led_fade_title_head">LED Fading</string>
     <string name="led_fade_summary_head">Enable LED smooth fading instead of sharp blinking.</string>
 
-    <!-- Touchkey -->
+    <!-- Touchkey tuning -->
     <string name="touchkey_subcat_title">Touchkeys</string>
     <string name="touchkey_light_title_head">Backlight</string>
     <string name="touchkey_light_summary_off">Enable backlight</string>
@@ -31,21 +33,24 @@
     <string name="touchkey_timeout_title_head">Backlight timeout</string>
     <string name="touchkey_timeout_summary_head">Set timeout for the backlight</string>
 
-    <!-- Dock -->
-    <string name="category_dock_title">Dock</string>
-    <string name="dockaudio_subcat_title">Dock Audio</string>
-    <string name="use_dock_audio_title_head">Use Dock USB Audio</string>
-    <string name="use_dock_audio_summary_head">Use the passive audio out on the dock</string>
-
-    <!-- Haptic -->
+    <!-- Haptic Preference -->
     <string name="category_haptic_title">Haptic</string>
-    <string name="vibrator_subcat_title">Vibrator</string>
-    <string name="vibrator_intensity_title_head">Vibrator Intensity</string>
-    <string name="vibrator_intensity_summary_head">Set vibrator intensity</string>
 
-    <!-- Radio -->
+    <!-- VibratorTuning -->
+    <string name="vibrator_title">Vibrator</string>
+    <string name="vibrator_tuning_title">Vibration strength</string>
+    <string name="vibrator_tuning_summary_head">Adjust the strength of the vibration feedback</string>
+    <string name="vibrator_warning">Values higher than %1$d are not recommended</string>
+
+    <!-- Radio Preference -->
     <string name="category_radio_title">Radio</string>
     <string name="hspa_title_head">HSPA</string>
     <string name="hspa_summary_head">Enable HSDPA/HSUPA</string>
 
+    <!-- Dock Preference -->
+    <string name="category_dock_title">Dock</string>
+    <string name="dockaudio_subcat_title">Audio</string>
+    <string name="use_dock_audio_title_head">Use Dock USB Audio</string>
+    <string name="use_dock_audio_summary_head">Use the passive audio out on the dock</string>
+
 </resources>