settings: sensor and translation cleanup

10 files changed, 47 insertions, 305 deletions

diff --git a/DeviceSettings/res/values-de/strings.xml b/DeviceSettings/res/values-de/strings.xml
index 54004a8..ea3eb2b 100644
--- a/DeviceSettings/res/values-de/strings.xml
+++ b/DeviceSettings/res/values-de/strings.xml
@@ -19,15 +19,20 @@
     <string name="touchscreen_sensitivity_title_head">Sensitivität</string>
     <string name="touchscreen_sensitivity_summary_head">Setzt die Touchpanel Sensitivität</string>
 
-    <string name="category_sensors_title">Sensoren</string>
-    <string name="gyro_subcat_title">Gyroskop</string>
-    <string name="use_gyro_calibration_title_head">Kalibierungsdaten</string>
-    <string name="use_gyro_calibration_summary_head">Benutze Kalibrierungswerte. Bitte nach Aktivierung eine Kalibrierung durchführen!</string>
-    <string name="calibrate_gyro_title_head">Kalibrieren</string>
-    <string name="calibrate_gyro_summary_head">Lege dein Telefon auf einen geraden Untergrund und starte die Kalibrierung.</string>
-    <string name="touchkey_subcat_title">Touch-Tasten</string>
-    <string name="touchkey_light_title_head">Aktiviere Tastenbeleuchtung</string>
+    <string name="touchkey_subcat_title">Touchkeys</string>
+    <string name="touchkey_light_title_head">Aktiviere Beleuchtung</string>
     <string name="touchkey_light_summary_head">Tasten leuchten auf während der Birdschirm aktiv ist</string>
+    <string name="touchkey_timeout_title_head">Zeitabschaltung der Beleuchtung</string>
+    <string name="touchkey_timeout_summary_head">Setze Zeit für automatische Abschaltung</string>
+
+    <string name="category_sensors_title">Sensoren</string>
+    <string name="accelerometer_subcat_title">Beschleunigungssensor</string>
+    <string name="use_accelerometer_calibration_title_head">Kalibierungsdaten</string>
+    <string name="use_accelerometer_calibration_summary_head">Benutze Kalibrierungswerte. Bitte nach Aktivierung eine Kalibrierung durchführen!</string>
+    <string name="calibrate_accelerometer_title_head">Kalibrieren</string>
+    <string name="calibrate_accelerometer_summary_head">Lege dein Telefon auf einen geraden Untergrund und starte die Kalibrierung.</string>
+    <string name="accelerometer_dialog_head">Kalibrierung beendet</string>
+    <string name="accelerometer_dialog_message">Der Sensor wurde erfolgreich kalibriert.</string>
 
     <string name="category_haptic_title">Haptik</string>
     <string name="vibrator_subcat_title">Vibrator</string>
@@ -37,4 +42,9 @@
     <string name="category_radio_title">Mobilfunk</string>
     <string name="hspa_title_head">HSPA</string>
     <string name="hspa_summary_head">Aktiviert HSDPA/HSUPA</string>
+
+    <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>
diff --git a/DeviceSettings/res/values-es/arrays.xml b/DeviceSettings/res/values-es/arrays.xml
deleted file mode 100644
index 8cf4fd9..0000000
--- a/DeviceSettings/res/values-es/arrays.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <string-array name="hspa_entries">
-        <item>Solo UMTS</item>
-        <item>Solo HSDPA</item>
-        <item>HSDPA + HSUPA</item>
-    </string-array>
-
-    <string-array name="mdnie_scenario_entries">
-        <item>Cámara (Predeterminado)</item>
-        <item>Video</item>
-        <item>Video Cálido</item>
-        <item>Video Frío</item>
-        <item>UI</item>
-        <item>Navegación</item>
-        <item>Galería</item>
-        <item>VT</item>
-    </string-array>
-
-    <string-array name="mdnie_mode_entries">
-        <item>Estándar (Predeterminado)</item>
-        <item>Dinámico</item>
-        <item>Natural</item>
-        <item>Película</item>
-    </string-array>
-
-    <string-array name="mdnie_negative_entries">
-        <item>Normal</item>
-        <item>Invertido</item>
-    </string-array>
-
-    <string-array name="mdnie_outdoor_entries">
-        <item>Desactivado (Predeterminado)</item>
-        <item>Activado</item>
-    </string-array>
-
-    <string-array name="panel_gamma_entries">
-        <item>2.2 (Predeterminado)</item>
-        <item>1.9</item>
-    </string-array>
-
-    <string-array name="touchscreen_sensitivity_entries">
-        <item>10</item>
-        <item>20</item>
-        <item>30</item>
-        <item>50 (Predeterminado)</item>
-        <item>70</item>
-        <item>100</item>
-    </string-array>
-
-    <string-array name="vibrator_intensity_entries">
-        <item>0%</item>
-        <item>25%</item>
-        <item>50% (Predeterminado)</item>
-        <item>75%</item>
-        <item>100%</item>
-    </string-array>
-</resources>
diff --git a/DeviceSettings/res/values-fi/arrays.xml b/DeviceSettings/res/values-fi/arrays.xml
deleted file mode 100644
index aaa4d82..0000000
--- a/DeviceSettings/res/values-fi/arrays.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <string-array name="mdnie_scenario_entries">
-        <item>Kamera (Oletus)</item>
-        <item>Video</item>
-        <item>Video(Lämmin)</item>
-        <item>Video(Kylmä)</item>
-        <item>Käyttöliittymä</item>
-        <item>Navigointi</item>
-        <item>Galleria</item>
-        <item>VT</item>
-    </string-array>
-
-    <string-array name="mdnie_mode_entries">
-        <item>Standardi (Oletus)</item>
-        <item>Dynaaminen</item>
-        <item>Luonnollinen</item>
-        <item>Elokuva</item>
-    </string-array>
-
-    <string-array name="mdnie_negative_entries">
-        <item>Normaali</item>
-        <item>Käänteinen</item>
-    </string-array>
-
-    <string-array name="mdnie_outdoor_entries">
-        <item>Pois päältä (Oletus)</item>
-        <item>Päällä</item>
-    </string-array>
-
-    <string-array name="panel_gamma_entries">
-        <item>2.2 (Oletus)</item>
-        <item>1.9</item>
-    </string-array>
-
-    <string-array name="touchscreen_sensitivity_entries">
-        <item>10</item>
-        <item>20</item>
-        <item>30</item>
-        <item>50 (Oletus)</item>
-        <item>70</item>
-        <item>100</item>
-    </string-array>
-
-    <string-array name="hspa_entries">
-        <item>Vain UMTS</item>
-        <item>Vain HSDPA</item>
-        <item>HSDPA + HSUPA</item>
-    </string-array>
-
-    <string-array name="vibrator_intensity_entries">
-        <item>0%</item>
-        <item>25%</item>
-        <item>50% (Oletus)</item>
-        <item>75%</item>
-        <item>100%</item>
-    </string-array>
-
-
-</resources>
diff --git a/DeviceSettings/res/values-fr/arrays.xml b/DeviceSettings/res/values-fr/arrays.xml
deleted file mode 100644
index d421873..0000000
--- a/DeviceSettings/res/values-fr/arrays.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <string-array name="mdnie_scenario_entries">
-        <item>Caméra (Par défaut)</item>
-        <item>Vidéo</item>
-        <item>Vidéo (chaud)</item>
-        <item>Video (froid)</item>
-        <item>UI</item>
-        <item>Navigation</item>
-        <item>Gallerie</item>
-        <item>VT</item>
-    </string-array>
-
-    <string-array name="mdnie_mode_entries">
-        <item>Standard (Par défaut)</item>
-        <item>Dynamique</item>
-        <item>Naturel</item>
-        <item>Vidéo</item>
-    </string-array>
-
-    <string-array name="mdnie_negative_entries">
-        <item>Normal</item>
-        <item>Inversé</item>
-    </string-array>
-
-    <string-array name="mdnie_outdoor_entries">
-        <item>Inactif (Par défaut)</item>
-        <item>Actif</item>
-    </string-array>
-
-    <string-array name="panel_gamma_entries">
-        <item>2.2 (Par défaut)</item>
-        <item>1.9</item>
-    </string-array>
-
-    <string-array name="touchscreen_sensitivity_entries">
-        <item>10</item>
-        <item>20</item>
-        <item>30</item>
-        <item>50 (Par défaut)</item>
-        <item>70</item>
-        <item>100</item>
-    </string-array>
-        
-    <string-array name="hspa_entries">
-        <item>UMTS seulement</item>
-        <item>HSDPA seulement</item>
-        <item>HSDPA + HSUPA</item>
-    </string-array>
-
-</resources>
diff --git a/DeviceSettings/res/values-hu/arrays.xml b/DeviceSettings/res/values-hu/arrays.xml
deleted file mode 100644
index ee1f831..0000000
--- a/DeviceSettings/res/values-hu/arrays.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <string-array name="mdnie_scenario_entries">
-        <item>Kamera (Alapbeállítás)</item>
-        <item>Videó</item>
-        <item>Videó (Meleg árnyalat)</item>
-        <item>Videó (Hideg árnyalat)</item>
-        <item>Felhasználói felület</item>
-        <item>Navigáció</item>
-        <item>Galéria</item>
-        <item>VT</item>
-    </string-array>
-
-    <string-array name="mdnie_mode_entries">
-        <item>Hagyományos (Alapbeállítás)</item>
-        <item>Dinamikus</item>
-        <item>Természetes</item>
-        <item>Film</item>
-    </string-array>
-
-    <string-array name="mdnie_negative_entries">
-        <item>Hagyományos</item>
-        <item>Fordított</item>
-    </string-array>
-
-    <string-array name="mdnie_outdoor_entries">
-        <item>Kikapcsolva (Alapbeállítás)</item>
-        <item>Bekapcsolva</item>
-    </string-array>
-
-    <string-array name="panel_gamma_entries">
-        <item>2.2 (Alapbeállítás)</item>
-        <item>1.9</item>
-    </string-array>
-
-    <string-array name="touchscreen_sensitivity_entries">
-        <item>10</item>
-        <item>20</item>
-        <item>30</item>
-        <item>50 (Alapbeállítás)</item>
-        <item>70</item>
-        <item>100</item>
-    </string-array>
-
-    <string-array name="hspa_entries">
-        <item>UMTS</item>
-        <item>HSDPA</item>
-        <item>HSDPA + HSUPA</item>
-    </string-array>
-
-</resources>
diff --git a/DeviceSettings/res/values-nl/arrays.xml b/DeviceSettings/res/values-nl/arrays.xml
deleted file mode 100644
index ab28dc7..0000000
--- a/DeviceSettings/res/values-nl/arrays.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="mdnie_scenario_entries">
-        <item>Camera (standaard)</item>
-        <item>Video</item>
-        <item>Video (warm)</item>
-        <item>Video (koud)</item>
-        <item>Uiterlijk</item>
-        <item>Navigatie</item>
-        <item>Galerij</item>
-        <item>VT</item>
-    </string-array>
-    <string-array name="mdnie_mode_entries">
-        <item>Standaard</item>
-        <item>Dynamisch</item>
-        <item>Natuurlijk</item>
-        <item>Film</item>
-    </string-array>
-    <string-array name="mdnie_negative_entries">
-        <item>Normaal</item>
-        <item>Omgedraaid</item>
-    </string-array>
-    <string-array name="mdnie_outdoor_entries">
-        <item>Uit (standaard)</item>
-        <item>Aan</item>
-    </string-array>
-    <string-array name="panel_gamma_entries">
-        <item>2,2 (standaard)</item>
-        <item>1,9</item>
-    </string-array>
-    <string-array name="touchscreen_sensitivity_entries">
-        <item>10</item>
-        <item>20</item>
-        <item>30</item>
-        <item>50 (standaard)</item>
-        <item>70</item>
-        <item>100</item>
-    </string-array>
-    <string-array name="vibrator_intensity_entries">
-        <item>0%</item>
-        <item>25%</item>
-        <item>50% (standaard)</item>
-        <item>75%</item>
-        <item>100%</item>
-    </string-array>
-    <string-array name="hspa_entries">
-        <item>Alleen UMTS</item>
-        <item>Alleen HSDPA</item>
-        <item>HSDPA &amp; HSUPA</item>
-    </string-array>
-</resources>
diff --git a/DeviceSettings/res/values/strings.xml b/DeviceSettings/res/values/strings.xml
index 72b8e86..a2436d3 100644
--- a/DeviceSettings/res/values/strings.xml
+++ b/DeviceSettings/res/values/strings.xml
@@ -26,11 +26,13 @@
     <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="accelerometer_subcat_title">Accelerometer</string>
+    <string name="use_accelerometer_calibration_title_head">Use calibration data</string>
+    <string name="use_accelerometer_calibration_summary_head">Use the accelerometer calibration values. Do a calibration after checking this!</string>
+    <string name="calibrate_accelerometer_title_head">Calibrate</string>
+    <string name="calibrate_accelerometer_summary_head">Put your phone on a flat surface, and press this to calibrate</string>
+    <string name="accelerometer_dialog_head">Calibration done</string>
+    <string name="accelerometer_dialog_message">The sensor has been successfully calibrated.</string>
 
     <string name="category_haptic_title">Haptic</string>
     <string name="vibrator_subcat_title">Vibrator</string>
@@ -42,7 +44,7 @@
     <string name="hspa_summary_head">Enable HSDPA/HSUPA</string>
 
     <string name="category_dock_title">Dock</string>
-    <string name="dockaudio_subcat_title">DOCK AUDIO</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>
diff --git a/DeviceSettings/res/xml/sensors_preferences.xml b/DeviceSettings/res/xml/sensors_preferences.xml
index bdce970..8c61e07 100644
--- a/DeviceSettings/res/xml/sensors_preferences.xml
+++ b/DeviceSettings/res/xml/sensors_preferences.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory 
-                android:title="@string/gyro_subcat_title">
+                android:title="@string/accelerometer_subcat_title">
     <!-- Use sensor calibration -->
     <CheckBoxPreference
-                android:key="use_gyro_calibration"
-                android:title="@string/use_gyro_calibration_title_head"
-                android:summary="@string/use_gyro_calibration_summary_head"
+                android:key="use_accelerometer_calibration"
+                android:title="@string/use_accelerometer_calibration_title_head"
+                android:summary="@string/use_accelerometer_calibration_summary_head"
                 />
 
-    <!-- Do gyro calibration -->
+    <!-- Do accelerometer calibration -->
     <Preference
-                android:key="calibrate_gyro"
-                android:title="@string/calibrate_gyro_title_head"
-                android:summary="@string/calibrate_gyro_summary_head"
+                android:key="calibrate_accelerometer"
+                android:title="@string/calibrate_accelerometer_title_head"
+                android:summary="@string/calibrate_accelerometer_summary_head"
                 />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java b/DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java
index c7da5f2..7f7970c 100644
--- a/DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java
@@ -41,8 +41,8 @@ public class DeviceSettings extends FragmentActivity {
     public static final String KEY_MDNIE_OUTDOOR = "mdnie_outdoor";
     public static final String KEY_PANEL_GAMMA = "panel_gamma";
     public static final String KEY_HSPA = "hspa";
-    public static final String KEY_USE_GYRO_CALIBRATION = "use_gyro_calibration";
-    public static final String KEY_CALIBRATE_GYRO = "calibrate_gyro";
+    public static final String KEY_USE_ACCELEROMETER_CALIBRATION = "use_accelerometer_calibration";
+    public static final String KEY_CALIBRATE_ACCELEROMETER = "calibrate_accelerometer";
     public static final String KEY_TOUCHSCREEN_SENSITIVITY = "touchscreen_sensitivity";
     public static final String KEY_TOUCHKEY_LIGHT = "touchkey_light";
     public static final String KEY_TOUCHKEY_TIMEOUT = "touchkey_timeout";
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java b/DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java
index 0299450..60cc1ac 100644
--- a/DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java
@@ -35,7 +35,7 @@ public class SensorsFragmentActivity extends PreferenceFragment {
     private static final String PREF_ENABLED = "1";
     private static final String TAG = "GalaxyNoteSettings_Sensors";
 
-    private static final String FILE_USE_GYRO_CALIB = "/sys/class/sec/gsensorcal/calibration";
+    private static final String FILE_USE_ACCELEROMETER_CALIB = "/sys/class/sec/gsensorcal/calibration";
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -54,15 +54,15 @@ public class SensorsFragmentActivity extends PreferenceFragment {
 
         Log.w(TAG, "key: " + key);
 
-        if (key.compareTo(DeviceSettings.KEY_USE_GYRO_CALIBRATION) == 0) {
+        if (key.compareTo(DeviceSettings.KEY_USE_ACCELEROMETER_CALIBRATION) == 0) {
             boxValue = (((CheckBoxPreference)preference).isChecked() ? "1" : "0");
-            Utils.writeValue(FILE_USE_GYRO_CALIB, boxValue);
-        } else if (key.compareTo(DeviceSettings.KEY_CALIBRATE_GYRO) == 0) {
+            Utils.writeValue(FILE_USE_ACCELEROMETER_CALIB, boxValue);
+        } else if (key.compareTo(DeviceSettings.KEY_CALIBRATE_ACCELEROMETER) == 0) {
             // when calibration data utilization is disablen and enabled back,
             // calibration is done at the same time by driver
-            Utils.writeValue(FILE_USE_GYRO_CALIB, "0");
-            Utils.writeValue(FILE_USE_GYRO_CALIB, "1");
-            Utils.showDialog((Context)getActivity(), "Calibration done", "The gyroscope has been successfully calibrated!");
+            Utils.writeValue(FILE_USE_ACCELEROMETER_CALIB, "0");
+            Utils.writeValue(FILE_USE_ACCELEROMETER_CALIB, "1");
+            Utils.showDialog((Context)getActivity(), getString(R.string.accelerometer_dialog_head), getString(R.string.accelerometer_dialog_message));
         }
 
         return true;
@@ -74,12 +74,12 @@ public class SensorsFragmentActivity extends PreferenceFragment {
 
     public static void restore(Context context) {
         SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
-        boolean gyroCalib = sharedPrefs.getBoolean(DeviceSettings.KEY_USE_GYRO_CALIBRATION, true);
+        boolean accelerometerCalib = sharedPrefs.getBoolean(DeviceSettings.KEY_USE_ACCELEROMETER_CALIBRATION, true);
 
-        // When use gyro calibration value is set to 1, calibration is done at the same time, which
+        // When use accelerometer calibration value is set to 1, calibration is done at the same time, which
         // means it is reset at each boot, providing wrong calibration most of the time at each reboot.
         // So we only set it to "0" if user wants it, as it defaults to 1 at boot
-        if (!gyroCalib)
-            Utils.writeValue(FILE_USE_GYRO_CALIB, "0");
+        if (!accelerometerCalib)
+            Utils.writeValue(FILE_USE_ACCELEROMETER_CALIB, "0");
     }
 }