diff --git a/Android.mk b/Android.mk
index 66feb65..2bd8c10 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,10 +14,9 @@
 # limitations under the License.
 #
 
-LOCAL_PATH := $(call my-dir)
-
 ifneq ($(filter i777 i9100 n7000 d710,$(TARGET_DEVICE)),)
 
+LOCAL_PATH := $(call my-dir)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
 endif
diff --git a/DeviceSettings/Android.mk b/DeviceSettings/Android.mk
new file mode 100644
index 0000000..6605185
--- /dev/null
+++ b/DeviceSettings/Android.mk
@@ -0,0 +1,15 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := DeviceSettings
+LOCAL_CERTIFICATE := platform
+
+include $(BUILD_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/DeviceSettings/AndroidManifest.xml b/DeviceSettings/AndroidManifest.xml
new file mode 100644
index 0000000..f117bb2
--- /dev/null
+++ b/DeviceSettings/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.cyanogenmod.settings.device"
+    android:sharedUserId="android.uid.system" >
+
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+
+    <application android:label="@string/app_name">
+        <activity
+            android:name="com.cyanogenmod.settings.device.DeviceSettings"
+            android:icon="@drawable/ic_launcher_cmdevicesettings"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="com.cyanogenmod.action.LAUNCH_DEVICE_SETTINGS" />
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
+        <receiver android:name=".Startup">
+            <intent-filter android:priority="100">
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+      
+        <activity android:name=".ScreenFragmentActivity" />
+        <activity android:name=".RadioFragmentActivity" />
+        
+    </application>
+</manifest>
diff --git a/DeviceSettings/res/drawable/ic_launcher_cmdevicesettings.png b/DeviceSettings/res/drawable/ic_launcher_cmdevicesettings.png
new file mode 100755
index 0000000..66de9c3
Binary files /dev/null and b/DeviceSettings/res/drawable/ic_launcher_cmdevicesettings.png differ
diff --git a/DeviceSettings/res/layout/top.xml b/DeviceSettings/res/layout/top.xml
new file mode 100755
index 0000000..744b568
--- /dev/null
+++ b/DeviceSettings/res/layout/top.xml
@@ -0,0 +1,5 @@
+<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/viewPager"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
+
diff --git a/DeviceSettings/res/values-da/arrays.xml b/DeviceSettings/res/values-da/arrays.xml
new file mode 100644
index 0000000..2a63d1e
--- /dev/null
+++ b/DeviceSettings/res/values-da/arrays.xml
@@ -0,0 +1,69 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string-array name="mdnie_scenario_entries">
+        <item>CyanogenMod (Standard)</item>
+        <item>UI</item>
+        <item>Video</item>
+        <item>Varm Video</item>
+        <item>Kold Video</item>
+        <item>Kamera</item>
+        <item>Navigation</item>
+        <item>Galleri</item>
+        <item>VT</item>
+    </string-array>
+
+   <string-array name="mdnie_mode_entries">
+        <item>Dynamisk</item>
+        <item>Standard (Standard)</item>
+        <item>Naturlig</item>
+        <item>Film</item>
+    </string-array>
+
+    <string-array name="mdnie_negative_entries">
+        <item>Normal</item>
+        <item>Negativ</item>
+    </string-array>
+
+    <string-array name="mdnie_outdoor_entries">
+        <item>Fra (Standard)</item>
+        <item>Til</item>
+    </string-array>
+
+    <string-array name="panel_gamma_entries">
+        <item>2.2 (Standard)</item>
+        <item>1.9</item>
+    </string-array>
+
+    <string-array name="touchscreen_sensitivity_entries">
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+        <item>50 (Standard)</item>
+        <item>70</item>
+        <item>100</item>
+    </string-array>
+
+    <string-array name="vibrator_intensity_entries">
+        <item>0%</item>
+        <item>25%</item>
+        <item>50% (Standard)</item>
+        <item>75%</item>
+        <item>100%</item>
+    </string-array>
+
+    <string-array name="hspa_entries">
+        <item>Kun UMTS</item>
+        <item>Kun HSDPA</item>
+        <item>HSDPA + HSUPA</item>
+    </string-array>
+
+    <string-array name="touchkey_timeout_entries">
+            <item>Aldrig</item>
+            <item>1 sekund</item>
+            <item>2 sekunder</item>
+            <item>3 sekunder (Standard)</item>
+            <item>4 sekunder</item>
+            <item>5 sekunder</item>
+            <item>6 sekunder</item>
+    </string-array>
+</resources>
diff --git a/DeviceSettings/res/values-da/strings.xml b/DeviceSettings/res/values-da/strings.xml
new file mode 100644
index 0000000..d6ea38d
--- /dev/null
+++ b/DeviceSettings/res/values-da/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Advanced settings</string>
+
+    <string name="category_screen_title">Skærm</string>
+    <string name="screen_colors_title">Farver</string>
+    <string name="mdnie_scenario_title_head">Scenarie</string>
+    <string name="mdnie_scenario_summary_head">Vælg mDNIe-scenarie</string>
+    <string name="mdnie_mode_title_head">Tilstand</string>
+    <string name="mdnie_mode_summary_head">Vælg mDNIe-tilstand</string>
+    <string name="mdnie_negative_title_head">Negativ tilstand</string>
+    <string name="mdnie_negative_summary_head">Slå negative farver til/fra</string>
+    <string name="mdnie_outdoor_title_head">Udendørs tilstand</string>
+    <string name="mdnie_outdoor_summary_head">Slå udendørs tilstand til/fra</string>
+    <string name="panel_gamma_title_head">Gamma</string>
+    <string name="panel_gamma_summary_head">Indstil gamma</string>
+
+    <string name="touchscreen_subcat_title">Touchscreen</string>
+    <string name="touchscreen_sensitivity_title_head">Følsomhed</string>
+    <string name="touchscreen_sensitivity_summary_head">Indstil skærmens følsomhed</string>
+
+    <string name="touchkey_subcat_title">Berøringstaster</string>
+    <string name="touchkey_light_title_head">Brug baggrundslys</string>
+    <string name="touchkey_light_summary_head">Lys tasterne op når skærmen er tændt</string>
+    <string name="touchkey_timeout_title_head">Timeout</string>
+    <string name="touchkey_timeout_summary_head">Tid før lyset slukker</string>
+
+    <string name="category_sensors_title">Sensorer</string>
+    <string name="accelerometer_subcat_title">Accelerometer</string>
+    <string name="use_accelerometer_calibration_title_head">Brug data fra kalibrering</string>
+    <string name="use_accelerometer_calibration_summary_head">Brug værdier fra kalibrering. Udfør kalibrering efter du vælger denne!</string>
+    <string name="calibrate_accelerometer_title_head">Kalibrér</string>
+    <string name="calibrate_accelerometer_summary_head">Læg din telefon på en vandret overflade og tryk her for kalibrering</string>
+    <string name="accelerometer_dialog_head">Kalibrering fuldført</string>
+    <string name="accelerometer_dialog_message">Accelerometeret er kalibreret.</string>
+
+    <string name="category_haptic_title">Haptik</string>
+    <string name="vibrator_subcat_title">Vibrator</string>
+    <string name="vibrator_intensity_title_head">Vibrator-styrke</string>
+    <string name="vibrator_intensity_summary_head">Indstil vibratorens intensitet</string>
+
+    <string name="category_radio_title">Radio</string>
+    <string name="hspa_title_head">HSPA</string>
+    <string name="hspa_summary_head">Slå HSDPA/HSUPA til/fra</string>
+
+    <string name="category_dock_title">Dock</string>
+    <string name="dockaudio_subcat_title">Lyd</string>
+    <string name="use_dock_audio_title_head">Brug Dockens USB lyd</string>
+    <string name="use_dock_audio_summary_head">Spil lyden gennem dockens højttaler</string>
+</resources>
diff --git a/DeviceSettings/res/values-de/arrays.xml b/DeviceSettings/res/values-de/arrays.xml
new file mode 100644
index 0000000..d3cc471
--- /dev/null
+++ b/DeviceSettings/res/values-de/arrays.xml
@@ -0,0 +1,70 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string-array name="mdnie_scenario_entries">
+        <item>CyanogenMod (Standard)</item>
+        <item>UI</item>
+        <item>Video</item>
+        <item>Video warm</item>
+        <item>Video kalt</item>
+        <item>Kamera</item>
+        <item>Navigation</item>
+        <item>Gallerie</item>
+        <item>VT</item>
+    </string-array>
+
+    <string-array name="mdnie_mode_entries">
+        <item>Dynamisch</item>
+        <item>Standard (Standard)</item>
+        <item>Natürlich</item>
+        <item>Film</item>
+    </string-array>
+
+    <string-array name="mdnie_negative_entries">
+        <item>Normal</item>
+        <item>Invertiert</item>
+    </string-array>
+
+    <string-array name="mdnie_outdoor_entries">
+        <item>Deaktiviert</item>
+        <item>Aktiviert</item>
+    </string-array>
+
+    <string-array name="panel_gamma_entries">
+        <item>2.2 (Standard)</item>
+        <item>1.9</item>
+    </string-array>
+
+    <string-array name="touchscreen_sensitivity_entries">
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+        <item>50 (Standard)</item>
+        <item>70</item>
+        <item>100</item>
+    </string-array>
+
+    <string-array name="vibrator_intensity_entries">
+        <item>0%</item>
+        <item>25%</item>
+        <item>50% (Standard)</item>
+        <item>75%</item>
+        <item>100%</item>
+    </string-array>
+
+    <string-array name="hspa_entries">
+        <item>Nur UMTS</item>
+        <item>Nur HSDPA</item>
+        <item>HSDPA + HSUPA</item>
+    </string-array>
+
+    <string-array name="touchkey_timeout_entries">
+            <item>Niemals</item>
+            <item>1 Sekunde</item>
+            <item>2 Sekunden</item>
+            <item>3 Sekunden (Standard)</item>
+            <item>4 Sekunden</item>
+            <item>5 Sekunden</item>
+            <item>6 Sekunden</item>
+    </string-array>
+
+</resources>
diff --git a/DeviceSettings/res/values-de/strings.xml b/DeviceSettings/res/values-de/strings.xml
new file mode 100644
index 0000000..054a949
--- /dev/null
+++ b/DeviceSettings/res/values-de/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Erweiterte Einstellungen</string>
+
+    <string name="category_screen_title">Bildschirm</string>
+    <string name="screen_colors_title">Farben</string>
+    <string name="mdnie_scenario_title_head">mDNIe-Szenario</string>
+    <string name="mdnie_scenario_summary_head">mDNIe-Szenario auswählen</string>
+    <string name="mdnie_mode_title_head">mDNIe-Modus</string>
+    <string name="mdnie_mode_summary_head">mDNIe-Modus auswählen</string>
+    <string name="mdnie_negative_title_head">Negativ</string>
+    <string name="mdnie_negative_summary_head">Farben invertieren an/aus</string>
+    <string name="mdnie_outdoor_title_head">Outdoor</string>
+    <string name="mdnie_outdoor_summary_head">Outdoor-Modus an/aus</string>
+    <string name="panel_gamma_title_head">Gamma</string>
+    <string name="panel_gamma_summary_head">Gamma Wert</string>
+
+    <string name="touchscreen_subcat_title">Touchscreen</string>
+    <string name="touchscreen_sensitivity_title_head">Empfindlichkeit</string>
+    <string name="touchscreen_sensitivity_summary_head">Berührungs-Empfindlichkeit</string>
+
+    <string name="touchkey_subcat_title">Touchkeys</string>
+    <string name="touchkey_light_title_head">Beleuchtung</string>
+    <string name="touchkey_light_summary_head">Touchkeys leuchten auf während das Display aktiv ist</string>
+    <string name="touchkey_timeout_title_head">Beleuchtungs-Timeout</string>
+    <string name="touchkey_timeout_summary_head">Zeit für die autom. Abschaltung der Touchkey-Beleuchtung</string>
+
+    <string name="category_sensors_title">Sensoren</string>
+    <string name="accelerometer_subcat_title">Beschleunigungssensor</string>
+    <string name="use_accelerometer_calibration_title_head">Kalibrierungsdaten</string>
+    <string name="use_accelerometer_calibration_summary_head">Kalibrierungswerte verwenden\nNach Aktivierung bitte Kalibrierung ausführen</string>
+    <string name="calibrate_accelerometer_title_head">Kalibrieren</string>
+    <string name="calibrate_accelerometer_summary_head">Sensor kalibrieren\nZum Starten das Telefon auf eine horizontale, ebene Fläche legen</string>
+    <string name="accelerometer_dialog_head">Kalibrierung beendet</string>
+    <string name="accelerometer_dialog_message">Der Beschleunigungssensor wurde kalibriert</string>
+
+    <string name="category_haptic_title">Haptik</string>
+    <string name="vibrator_subcat_title">Vibration</string>
+    <string name="vibrator_intensity_title_head">Intensität</string>
+    <string name="vibrator_intensity_summary_head">Vibrations-Intensität</string>
+
+    <string name="category_radio_title">Mobilfunk</string>
+    <string name="hspa_title_head">HSPA</string>
+    <string name="hspa_summary_head">HSDPA/HSUPA an/aus</string>
+
+    <string name="category_dock_title">Dock</string>
+    <string name="dockaudio_subcat_title">Audio</string>
+    <string name="use_dock_audio_title_head">USB-Dock Audio</string>
+    <string name="use_dock_audio_summary_head">Passive Audio-Ausgabe des USB-Docks verwenden</string>
+</resources>
diff --git a/DeviceSettings/res/values-es/arrays.xml b/DeviceSettings/res/values-es/arrays.xml
new file mode 100644
index 0000000..412100c
--- /dev/null
+++ b/DeviceSettings/res/values-es/arrays.xml
@@ -0,0 +1,60 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="mdnie_scenario_entries">
+        <item>CyanogenMod (por defecto)</item>
+        <item>UI</item>
+        <item>Vídeo</item>
+        <item>Vídeo cálido</item>
+        <item>Vídeo frío</item>
+        <item>Camara</item>
+        <item>Navegación</item>
+        <item>Galería</item>
+        <item>VT</item>
+    </string-array>
+    <string-array name="mdnie_mode_entries">
+        <item>Dinámico</item>
+        <item>Estándar (por defecto)</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>Apagado (por defecto)</item>
+        <item>Encendido</item>
+    </string-array>
+    <string-array name="panel_gamma_entries">
+        <item>2,2 (por defecto)</item>
+        <item>1,9</item>
+    </string-array>
+    <string-array name="touchscreen_sensitivity_entries">
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+        <item>50 (por defecto)</item>
+        <item>70</item>
+        <item>100</item>
+    </string-array>
+    <string-array name="vibrator_intensity_entries">
+        <item>0%</item>
+        <item>25%</item>
+        <item>50% (por defecto)</item>
+        <item>75%</item>
+        <item>100%</item>
+    </string-array>
+    <string-array name="hspa_entries">
+        <item>Sólo UMTS</item>
+        <item>Sólo HSDPA</item>
+        <item>HSDPA + HSUPA</item>
+    </string-array>
+    <string-array name="touchkey_timeout_entries">
+        <item>Nunca</item>
+        <item>1 segundo</item>
+        <item>2 segundos</item>
+        <item>3 segundos (por defecto)</item>
+        <item>4 segundos</item>
+        <item>5 segundos</item>
+        <item>6 segundos</item>
+    </string-array>
+</resources>
diff --git a/DeviceSettings/res/values-es/strings.xml b/DeviceSettings/res/values-es/strings.xml
new file mode 100644
index 0000000..8d54bfc
--- /dev/null
+++ b/DeviceSettings/res/values-es/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Ajustes avanzados</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 escenario mDNIe</string>
+    <string name="mdnie_mode_title_head">Modo</string>
+    <string name="mdnie_mode_summary_head">Establecer modo mDNIe</string>
+    <string name="mdnie_negative_title_head">Modo Negativo</string>
+    <string name="mdnie_negative_summary_head">Habilitar/deshabilitar colores invertidos</string>
+    <string name="mdnie_outdoor_title_head">Modo al aire libre</string>
+    <string name="mdnie_outdoor_summary_head">Habilitar/deshabilitar modo al aire libre</string>
+    <string name="panel_gamma_title_head">Gamma</string>
+    <string name="panel_gamma_summary_head">Establece el valor Gamma de la pantalla</string>
+    <string name="touchscreen_subcat_title">Pantalla táctil</string>
+    <string name="touchscreen_sensitivity_title_head">Sensibilidad táctil</string>
+    <string name="touchscreen_sensitivity_summary_head">Establecer la sensibilidad del panel táctil</string>
+    <string name="touchkey_subcat_title">Teclas táctiles</string>
+    <string name="touchkey_light_title_head">Habilitar retroiluminación de teclas táctiles</string>
+    <string name="touchkey_light_summary_head">Retroiluminación teclas táctiles cuando la pantalla está activa</string>
+    <string name="touchkey_timeout_title_head">Tiempo de espera de retroiluminación</string>
+    <string name="touchkey_timeout_summary_head">Tiempo tras pulsar una tecla antes de apagar la retroiluminación</string>
+    <string name="category_sensors_title">Sensores</string>
+    <string name="accelerometer_subcat_title">Acelerómetro</string>
+    <string name="use_accelerometer_calibration_title_head">Usar datos de calibración</string>
+    <string name="use_accelerometer_calibration_summary_head">Usar los valores de calibración del acelerómetro. ¡Realizar una calibración después de habilitar esta funcionalidad!</string>
+    <string name="calibrate_accelerometer_title_head">Calibrar</string>
+    <string name="calibrate_accelerometer_summary_head">Poner el teléfono sobre una superficie plana, y presionar este menú para calibrar de nuevo</string>
+    <string name="accelerometer_dialog_head">Calibración realizada</string>
+    <string name="accelerometer_dialog_message">El sensor ha sido calibrado satisfactoriamente</string>
+    <string name="category_haptic_title">Háptica</string>
+    <string name="vibrator_subcat_title">Vibración</string>
+    <string name="vibrator_intensity_title_head">Intensidad de vibración</string>
+    <string name="vibrator_intensity_summary_head">Establecer la intensidad de vibración</string>
+    <string name="category_radio_title">Radio</string>
+    <string name="hspa_title_head">HSPA</string>
+    <string name="hspa_summary_head">Habilitar HSDPA/HSUPA</string>
+    <string name="category_dock_title">Base</string>
+    <string name="dockaudio_subcat_title">Sonido</string>
+    <string name="use_dock_audio_title_head">Usar sonido USB</string>
+    <string name="use_dock_audio_summary_head">Utilizar la salida de audio de la base</string>
+</resources>
diff --git a/DeviceSettings/res/values-fi/arrays.xml b/DeviceSettings/res/values-fi/arrays.xml
new file mode 100644
index 0000000..e954025
--- /dev/null
+++ b/DeviceSettings/res/values-fi/arrays.xml
@@ -0,0 +1,70 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string-array name="mdnie_scenario_entries">
+        <item>CyanogenMod (Oletus)</item>
+        <item>Käyttöliittymä</item>
+        <item>Video</item>
+        <item>Video(Lämmin)</item>
+        <item>Video(Kylmä)</item>
+        <item>Kamera</item>
+        <item>Navigointi</item>
+        <item>Galleria</item>
+        <item>VT</item>
+    </string-array>
+
+    <string-array name="mdnie_mode_entries">
+        <item>Dynaaminen</item>
+        <item>Standardi (Oletus)</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="vibrator_intensity_entries">
+        <item>0%</item>
+        <item>25%</item>
+        <item>50% (Oletus)</item>
+        <item>75%</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="touchkey_timeout_entries">
+            <item>Never</item>
+            <item>1 second</item>
+            <item>2 seconds</item>
+            <item>3 seconds (Oletus)</item>
+            <item>4 seconds</item>
+            <item>5 seconds</item>
+            <item>6 seconds</item>
+    </string-array>
+
+</resources>
diff --git a/DeviceSettings/res/values-fi/strings.xml b/DeviceSettings/res/values-fi/strings.xml
new file mode 100644
index 0000000..6e7ce2a
--- /dev/null
+++ b/DeviceSettings/res/values-fi/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Advanced settings</string>
+
+    <string name="category_screen_title">Näyttö</string>
+    <string name="screen_colors_title">Värit</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>
+    <string name="mdnie_mode_summary_head">Vaihda mDNIe-tila</string>
+    <string name="mdnie_negative_title_head">Negatiivi-tila</string>
+    <string name="mdnie_negative_summary_head">Käytä käänteisiä värejä</string>
+    <string name="mdnie_outdoor_title_head">Ulkoilma-tila</string>
+    <string name="mdnie_outdoor_summary_head">Ota ulkoilma-tila käyttöön</string>
+    <string name="panel_gamma_title_head">Näytön gamma</string>
+    <string name="panel_gamma_summary_head">Säädä näytön gamma-arvo</string>
+
+    <string name="touchscreen_subcat_title">Kosketusnäyttö</string>
+    <string name="touchscreen_sensitivity_title_head">Kosketuksen herkkyys</string>
+    <string name="touchscreen_sensitivity_summary_head">Säädä näytön herkkyyttä</string>
+
+    <string name="touchkey_subcat_title">Kosketusnäppäimet</string>
+    <string name="touchkey_light_title_head">Ota näppäinten taustavalo käyttöön</string>
+    <string name="touchkey_light_summary_head">Näytön ollessa päällä valot syttyvät</string>
+    <string name="touchkey_timeout_title_head">Taustavalon aikakatkaisu</string>
+    <string name="touchkey_timeout_summary_head">Säädä taustavalon sammumisen aikaväliä kosketuksesta</string>
+
+    <string name="category_sensors_title">Sensorit</string>
+    <string name="accelerometer_subcat_title">Kiihtyvyysanturi</string>
+    <string name="use_accelerometer_calibration_title_head">Käytä kalibrointitietoja</string>
+    <string name="use_accelerometer_calibration_summary_head">Käytä kiihtyvyysanturin kalibrointiarvoja. Kalibroi merkattuasi tämän!</string>
+    <string name="calibrate_accelerometer_title_head">Kalibroi</string>
+    <string name="calibrate_accelerometer_summary_head">Aseta puhelin tasaiselle alustalle ja paina tätä kalibroidaksesi</string>
+    <string name="accelerometer_dialog_head">Kalibrointi valmis</string>
+    <string name="accelerometer_dialog_message">Sensori kalibroitu onnistuneesti</string>
+
+    <string name="category_haptic_title">Haptinen</string>
+    <string name="vibrator_subcat_title">Värinä</string>
+    <string name="vibrator_intensity_title_head">Värinän voimakkuus</string>
+    <string name="vibrator_intensity_summary_head">Säädä värinän voimakkuutta</string>
+
+    <string name="category_radio_title">Radio</string>
+    <string name="hspa_title_head">HSPA</string>
+    <string name="hspa_summary_head">Ota HSDPA/HSUPA käyttöön</string>
+
+    <string name="category_dock_title">Telakka</string>
+    <string name="dockaudio_subcat_title">Audio</string>
+    <string name="use_dock_audio_title_head">Käytä USB-audiotelakkaa</string>
+    <string name="use_dock_audio_summary_head">Käytä telakan audioulostuloa</string>
+</resources>
diff --git a/DeviceSettings/res/values-fr/arrays.xml b/DeviceSettings/res/values-fr/arrays.xml
new file mode 100644
index 0000000..89fa725
--- /dev/null
+++ b/DeviceSettings/res/values-fr/arrays.xml
@@ -0,0 +1,75 @@
+<?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.
+ -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="mdnie_scenario_entries">
+        <item>CyanogenMod (Défaut)</item>
+        <item>UI</item>
+        <item>Vidéo</item>
+        <item>Vidéo chaude</item>
+        <item>Vidéo froide</item>
+        <item>Caméra</item>
+        <item>Navigation</item>
+        <item>Galerie</item>
+        <item>VT</item>
+    </string-array>
+    <string-array name="mdnie_mode_entries">
+        <item>Dynamique</item>
+        <item>Standard (Défaut)</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>Désactivé (Défaut)</item>
+        <item>Activer</item>
+    </string-array>
+    <string-array name="panel_gamma_entries">
+        <item>2.2 (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 (Défaut)</item>
+        <item>70</item>
+        <item>100</item>
+    </string-array>
+    <string-array name="vibrator_intensity_entries">
+        <item>Désactivé</item>
+        <item>25%</item>
+        <item>50% (Défaut)</item>
+        <item>75%</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>
+    <string-array name="touchkey_timeout_entries">
+        <item>Désactivé</item>
+        <item>1 seconde</item>
+        <item>2 secondes</item>
+        <item>3 secondes (Défaut)</item>
+        <item>4 secondes</item>
+        <item>5 secondes</item>
+        <item>6 secondes</item>
+    </string-array>
+</resources>
diff --git a/DeviceSettings/res/values-fr/strings.xml b/DeviceSettings/res/values-fr/strings.xml
new file mode 100644
index 0000000..38c5e55
--- /dev/null
+++ b/DeviceSettings/res/values-fr/strings.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">Paramètres avancés</string>
+    <string name="category_screen_title">Écran</string>
+    <string name="screen_colors_title">Couleurs</string>
+    <string name="mdnie_scenario_title_head">Scénario</string>
+    <string name="mdnie_scenario_summary_head">Définir le scénario mDNIe</string>
+    <string name="mdnie_mode_title_head">Mode</string>
+    <string name="mdnie_mode_summary_head">Définir le mode mDNIe</string>
+    <string name="mdnie_negative_title_head">Mode négatif</string>
+    <string name="mdnie_negative_summary_head">Activer/désactiver les couleurs inversées</string>
+    <string name="mdnie_outdoor_title_head">Mode extérieur</string>
+    <string name="mdnie_outdoor_summary_head">Activer/désactiver le mode extérieur</string>
+    <string name="panel_gamma_title_head">Gamma écran</string>
+    <string name="panel_gamma_summary_head">Définir la valeur de gamma de l\'écran</string>
+    <string name="touchscreen_subcat_title">Tactile</string>
+    <string name="touchscreen_sensitivity_title_head">Sensibilité</string>
+    <string name="touchscreen_sensitivity_summary_head">Définir la sensibilité du toucher</string>
+    <string name="touchkey_subcat_title">Touches tactiles</string>
+    <string name="touchkey_light_title_head">Rétroéclairage</string>
+    <string name="touchkey_light_summary_head">Activer le rétroéclairage des touches tactiles lorsque l\'écran est activé</string>
+    <string name="touchkey_timeout_title_head">Délai avant extinction</string>
+    <string name="touchkey_timeout_summary_head">Définir le délai avant l\'extinction des touches</string>
+    <string name="category_sensors_title">Capteurs</string>
+    <string name="accelerometer_subcat_title">Accéléromètre</string>
+    <string name="use_accelerometer_calibration_title_head">Utiliser les données de calibrage</string>
+    <string name="use_accelerometer_calibration_summary_head">Utiliser les données de calibrage de l\'accéléromètre. Faire un calibrage après avoir coché cette option\u00A0!</string>
+    <string name="calibrate_accelerometer_title_head">Calibrer</string>
+    <string name="calibrate_accelerometer_summary_head">Poser le téléphone sur une surface plane puis appuyer ici pour le calibrer</string>
+    <string name="accelerometer_dialog_head">Calibrage terminé</string>
+    <string name="accelerometer_dialog_message">Le capteur a été correctement calibré.</string>
+    <string name="category_haptic_title">Haptique</string>
+    <string name="vibrator_subcat_title">Vibreur</string>
+    <string name="vibrator_intensity_title_head">Intensité du vibreur</string>
+    <string name="vibrator_intensity_summary_head">Définir l\'intensité du vibreur</string>
+    <string name="category_radio_title">Radio</string>
+    <string name="hspa_title_head">HSPA</string>
+    <string name="hspa_summary_head">Activer HSDPA/HSUPA</string>
+    <string name="category_dock_title">Station d\'accueil</string>
+    <string name="dockaudio_subcat_title">Audio</string>
+    <string name="use_dock_audio_title_head">Sortie audio</string>
+    <string name="use_dock_audio_summary_head">Utiliser la sortie audio de la station d\'accueil</string>
+</resources>
diff --git a/DeviceSettings/res/values-hu/arrays.xml b/DeviceSettings/res/values-hu/arrays.xml
new file mode 100644
index 0000000..3363918
--- /dev/null
+++ b/DeviceSettings/res/values-hu/arrays.xml
@@ -0,0 +1,70 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string-array name="mdnie_scenario_entries">
+        <item>CyanogenMod (Alapbeállítás)</item>
+        <item>Felhasználói felület</item>
+        <item>Videó</item>
+        <item>Videó (Meleg árnyalat)</item>
+        <item>Videó (Hideg árnyalat)</item>
+        <item>Kamera</item>
+        <item>Navigáció</item>
+        <item>Galéria</item>
+        <item>VT</item>
+    </string-array>
+
+    <string-array name="mdnie_mode_entries">
+        <item>Dinamikus</item>
+        <item>Hagyományos (Alapbeállítás)</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="vibrator_intensity_entries">
+        <item>0%</item>
+        <item>25%</item>
+        <item>50% (Alapbeállítás)</item>
+        <item>75%</item>
+        <item>100%</item>
+    </string-array>
+
+    <string-array name="hspa_entries">
+        <item>UMTS</item>
+        <item>HSDPA</item>
+        <item>HSDPA + HSUPA</item>
+    </string-array>
+
+    <string-array name="touchkey_timeout_entries">
+            <item>Soha</item>
+            <item>1 másodperc</item>
+            <item>2 másodperc</item>
+            <item>3 másodperc (Alapbeállítás)</item>
+            <item>4 másodperc</item>
+            <item>5 másodperc</item>
+            <item>6 másodperc</item>
+    </string-array>
+
+</resources>
diff --git a/DeviceSettings/res/values-hu/strings.xml b/DeviceSettings/res/values-hu/strings.xml
new file mode 100644
index 0000000..8c5f2c2
--- /dev/null
+++ b/DeviceSettings/res/values-hu/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Advanced settings</string>
+
+    <string name="category_screen_title">Kijelző</string>
+    <string name="screen_colors_title">Színek</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>
+    <string name="mdnie_mode_summary_head">mDNIe üzemmódok</string>
+    <string name="mdnie_negative_title_head">Negatív üzemmód</string>
+    <string name="mdnie_negative_summary_head">Fordított színek ki/be</string>
+    <string name="mdnie_outdoor_title_head">Szabadtéri üzemmód</string>
+    <string name="mdnie_outdoor_summary_head">Szabadtéri üzemmód ki/be</string>
+    <string name="panel_gamma_title_head">Kijelző gamma-értéke</string>
+    <string name="panel_gamma_summary_head">Kijelző gamma-érték beállítása</string>
+
+    <string name="touchscreen_subcat_title">Érintőképernyő</string>
+    <string name="touchscreen_sensitivity_title_head">Érzékenység</string>
+    <string name="touchscreen_sensitivity_summary_head">Érintőképernyő érzékenységének beállítása</string>
+
+    <string name="touchkey_subcat_title">Érintőgombok</string>
+    <string name="touchkey_light_title_head">Érintőgombok háttérvilágítása</string>
+    <string name="touchkey_light_summary_head">Bekapcsolja az érintőgombok háttérvilágítását bekapcsolt képernyőnél</string>
+    <string name="touchkey_timeout_title_head">Háttérvilágítás időkorlátja</string>
+    <string name="touchkey_timeout_summary_head">Háttérvilágítás késleltetése</string>
+
+    <string name="category_sensors_title">Szenzorok</string>
+    <string name="accelerometer_subcat_title">Giroszkóp</string>
+    <string name="use_accelerometer_calibration_title_head">Kalibrálási érték használata</string>
+    <string name="use_accelerometer_calibration_summary_head">Kalibrálási érték használata. Érdemes újra kalibrálni, ha ez a funkció használatban van!</string>
+    <string name="calibrate_accelerometer_title_head">Kalibrálás</string>
+    <string name="calibrate_accelerometer_summary_head">Kalibráláshoz a telefont vízszintes felületre kell helyezni, és megérinteni ezt a gombot</string>
+    <string name="accelerometer_dialog_head">Kalibrálás befejezve</string>
+    <string name="accelerometer_dialog_message">Az érzékelő sikeresen bekalibrálva.</string>
+
+    <string name="category_haptic_title">Érintési visszajelzés</string>
+    <string name="vibrator_subcat_title">Rezgés</string>
+    <string name="vibrator_intensity_title_head">Rezgés erőssége</string>
+    <string name="vibrator_intensity_summary_head">Rezgés erősségének beállítása</string>
+
+    <string name="category_radio_title">GSM Rádió</string>
+    <string name="hspa_title_head">HSPA</string>
+    <string name="hspa_summary_head">HSDPA/HSUPA engedélyezése</string>
+
+    <string name="category_dock_title">Dokkoló</string>
+    <string name="dockaudio_subcat_title">Dokkoló hangszórók</string>
+    <string name="use_dock_audio_title_head">Dokkoló hangszóróinak használata</string>
+    <string name="use_dock_audio_summary_head">Használja a dokkoló passzív hangkimenetét</string>
+</resources>
diff --git a/DeviceSettings/res/values-it/strings.xml b/DeviceSettings/res/values-it/strings.xml
new file mode 100644
index 0000000..831f12e
--- /dev/null
+++ b/DeviceSettings/res/values-it/strings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Advanced settings</string>
+    <string name="category_screen_title">Schermo</string>
+    <string name="screen_colors_title">Colori</string>
+    <string name="mdnie_scenario_title_head">Scenario</string>
+    <string name="mdnie_scenario_summary_head">Imposta lo scenario mDNIe</string>
+    <string name="mdnie_mode_title_head">Modalità</string>
+    <string name="mdnie_mode_summary_head">Imposta la modalità mDNIe</string>
+    <string name="mdnie_negative_title_head">Negativo</string>
+    <string name="mdnie_negative_summary_head">Abilita/disabilita i colori invertiti</string>
+    <string name="mdnie_outdoor_title_head">Esterno</string>
+    <string name="mdnie_outdoor_summary_head">Abilita/disabilita la modalità esterno</string>
+    <string name="panel_gamma_title_head">Gamma schermo</string>
+    <string name="panel_gamma_summary_head">Imposta il valore gamma dello schermo</string>
+    <string name="touchscreen_subcat_title">Schermo tattile</string>
+    <string name="touchscreen_sensitivity_title_head">Sensibilità tocco</string>
+    <string name="touchscreen_sensitivity_summary_head">Imposta la sensibilità al tocco dello schermo</string>
+    <string name="touchkey_subcat_title">Tasti a sfioramento</string>
+    <string name="touchkey_light_title_head">Retroilluminazione</string>
+    <string name="touchkey_light_summary_head">Abilita la retroilluminazione dei tasti a sfioramento quando lo schermo è attivo</string>
+    <string name="touchkey_timeout_title_head">Timer retroilluminazione</string>
+    <string name="touchkey_timeout_summary_head">Imposta l\'intervallo dopo cui la retroilluminazione dei tasti si spegne</string>
+    <string name="category_sensors_title">Sensori</string>
+    <string name="accelerometer_subcat_title">Accelerometro</string>
+    <string name="use_accelerometer_calibration_title_head">Usa dati di calibrazione</string>
+    <string name="use_accelerometer_calibration_summary_head">Usa i valori di calibrazione dell\'accelerometro. Effettuare una calibrazione dopo aver attivato questa impostazione!</string>
+    <string name="calibrate_accelerometer_title_head">Calibrazione</string>
+    <string name="calibrate_accelerometer_summary_head">Posizionare il telefono su una superficie orizzontale piana e premere per effettuare la calibrazione</string>
+    <string name="accelerometer_dialog_head">Calibrazione effettuata</string>
+    <string name="accelerometer_dialog_message">Il sensore è stato correttamente calibrato.</string>
+    <string name="category_haptic_title">Feedback tattile</string>
+    <string name="vibrator_subcat_title">Vibratore</string>
+    <string name="vibrator_intensity_title_head">Intensità vibrazione</string>
+    <string name="vibrator_intensity_summary_head">Imposta l\'intensità della vibrazione</string>
+    <string name="category_radio_title">Radio</string>
+    <string name="hspa_title_head">HSPA</string>
+    <string name="hspa_summary_head">Abilita HSDPA/HSUPA</string>
+    <string name="category_dock_title">Dock</string>
+    <string name="dockaudio_subcat_title">Audio</string>
+    <string name="use_dock_audio_title_head">Usa USB audio in dock</string>
+    <string name="use_dock_audio_summary_head">Usa l\'uscita audio passiva quando in dock</string>
+</resources>
+
diff --git a/DeviceSettings/res/values-nl/arrays.xml b/DeviceSettings/res/values-nl/arrays.xml
new file mode 100644
index 0000000..52fb181
--- /dev/null
+++ b/DeviceSettings/res/values-nl/arrays.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-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.
+ -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="mdnie_scenario_entries">
+        <item>CyanogenMod (Standaard)</item>
+        <item>Uiterlijk</item>
+        <item>Video</item>
+        <item>Video (warm)</item>
+        <item>Video (koud)</item>
+        <item>Camera</item>
+        <item>Navigatie</item>
+        <item>Galerij</item>
+        <item>VT</item>
+    </string-array>
+    <string-array name="mdnie_mode_entries">
+        <item>Dynamisch</item>
+        <item>Standaard (Standaard)</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>
+    <string-array name="touchkey_timeout_entries">
+        <item>Nooit</item>
+        <item>1 seconde</item>
+        <item>2 seconden</item>
+        <item>3 seconden (standaard)</item>
+        <item>4 seconden</item>
+        <item>5 seconden</item>
+        <item>6 seconden</item>
+    </string-array>
+</resources>
diff --git a/DeviceSettings/res/values-nl/strings.xml b/DeviceSettings/res/values-nl/strings.xml
new file mode 100644
index 0000000..2872d3a
--- /dev/null
+++ b/DeviceSettings/res/values-nl/strings.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-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.
+ -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">Geavanceerde instellingen</string>
+
+    <string name="screen_colors_title">Kleuren</string>
+    <string name="category_screen_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>
+    <string name="mdnie_mode_summary_head">mDNIe-modus instellen</string>
+    <string name="mdnie_negative_title_head">Negatieve modus</string>
+    <string name="mdnie_negative_summary_head">Negatieve kleuren in-/uitschakelen</string>
+    <string name="mdnie_outdoor_title_head">Buitenmodus</string>
+    <string name="mdnie_outdoor_summary_head">Buitenmodus in-/uitschakelen</string>
+    <string name="panel_gamma_title_head">Schermgamma</string>
+    <string name="panel_gamma_summary_head">Schermgammawaarden instellen</string>
+
+    <string name="touchscreen_subcat_title">Aanraakscherm</string>
+    <string name="touchscreen_sensitivity_title_head">Aanraakgevoeligheid</string>
+    <string name="touchscreen_sensitivity_summary_head">Gevoeligheid aanraakscherm instellen</string>
+
+    <string name="touchkey_subcat_title">Aanraakknop</string>
+    <string name="touchkey_light_title_head">Achtergrondlicht bij knoppen inschakelen</string>
+    <string name="touchkey_light_summary_head">Aanraakknoppen oplichten indien scherm aan is</string>
+    <string name="touchkey_timeout_title_head">Time-out achtergrondlicht</string>
+    <string name="touchkey_timeout_summary_head">Vertraging na druk op een knop voor uitschakelen achtergrondlicht</string>
+
+    <string name="category_sensors_title">Sensoren</string>
+    <string name="accelerometer_subcat_title">Gyroscoop</string>
+    <string name="use_accelerometer_calibration_title_head">Kalibratiegegevens gebruiken</string>
+    <string name="use_accelerometer_calibration_summary_head">Kalibratiewaarden van de gyroscoop gebruiken. Voer hierna a.u.b. een kalibratie uit.</string>
+    <string name="calibrate_accelerometer_title_head">Kalibreren</string>
+    <string name="calibrate_accelerometer_summary_head">Plaats de telefoon op een vlakke ondergrond en tik hier om te kalibreren</string>
+    <string name="accelerometer_dialog_head">Kalibratie afgerond</string>
+    <string name="accelerometer_dialog_message">De sensor is succesvol gekalibreerd.</string>
+
+    <string name="category_haptic_title">Trillen</string>
+    <string name="vibrator_subcat_title">Trillen</string>
+    <string name="vibrator_intensity_title_head">Trilintensiteit</string>
+    <string name="vibrator_intensity_summary_head">Trilintensiteit instellen</string>
+
+    <string name="category_radio_title">Radio</string>
+    <string name="hspa_title_head">HSPA</string>
+    <string name="hspa_summary_head">HSDPA/HSUPA inschakelen</string>
+
+    <string name="category_dock_title">Dock</string>
+    <string name="dockaudio_subcat_title">Geluid</string>
+    <string name="use_dock_audio_title_head">USB-geluidsdock</string>
+    <string name="use_dock_audio_summary_head">Passieve geluidsuitgang van het dock gebruiken</string>
+</resources>
diff --git a/DeviceSettings/res/values-pl/arrays.xml b/DeviceSettings/res/values-pl/arrays.xml
new file mode 100644
index 0000000..e9554f1
--- /dev/null
+++ b/DeviceSettings/res/values-pl/arrays.xml
@@ -0,0 +1,70 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string-array name="mdnie_scenario_entries">
+        <item>CyanogenMod (domyślnie)</item>
+        <item>UI</item>
+        <item>Wideo</item>
+        <item>Ciepły film</item>
+        <item>Zimny film</item>
+        <item>Kamera</item>
+        <item>Nawigacja</item>
+        <item>Galeria</item>
+        <item>VT</item>
+    </string-array>
+
+    <string-array name="mdnie_mode_entries">
+        <item>Dynamicznie</item>
+        <item>Standardowo (domyślnie)</item>
+        <item>Naturalnie</item>
+        <item>Film</item>
+    </string-array>
+
+    <string-array name="mdnie_negative_entries">
+        <item>Normalnie</item>
+        <item>Odwrócony</item>
+    </string-array>
+
+    <string-array name="mdnie_outdoor_entries">
+        <item>Wyłączony (domyślnie)</item>
+        <item>Włączony</item>
+    </string-array>
+
+    <string-array name="panel_gamma_entries">
+        <item>2.2 (domyślnie)</item>
+        <item>1.9</item>
+    </string-array>
+
+    <string-array name="touchscreen_sensitivity_entries">
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+        <item>50 (domyślnie)</item>
+        <item>70</item>
+        <item>100</item>
+    </string-array>
+
+    <string-array name="vibrator_intensity_entries">
+        <item>0%</item>
+        <item>25%</item>
+        <item>50% (domyślnie)</item>
+        <item>75%</item>
+        <item>100%</item>
+    </string-array>
+
+   <string-array name="hspa_entries">
+        <item>Tylko UMTS</item>
+        <item>Tylko HSDPA</item>
+        <item>HSDPA + HSUPA</item>
+    </string-array>
+
+    <string-array name="touchkey_timeout_entries">
+        <item>Nigdy</item>
+        <item>1 sekunda</item>
+        <item>2 sekundy</item>
+        <item>3 sekundy (domyślnie)</item>
+        <item>4 sekundy</item>
+        <item>5 sekund</item>
+        <item>6 sekund</item>
+    </string-array>
+
+</resources>
diff --git a/DeviceSettings/res/values-pl/strings.xml b/DeviceSettings/res/values-pl/strings.xml
new file mode 100644
index 0000000..e10b92c
--- /dev/null
+++ b/DeviceSettings/res/values-pl/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Advanced settings</string>
+
+    <string name="category_screen_title">Ekran</string>
+    <string name="screen_colors_title">Kolory</string>
+    <string name="mdnie_scenario_title_head">Technologia mDNIe</string>
+    <string name="mdnie_scenario_summary_head">Ustaw scenariusz mDNIe</string>
+    <string name="mdnie_mode_title_head">Tryb</string>
+    <string name="mdnie_mode_summary_head">Ustaw tryb mDNIe</string>
+    <string name="mdnie_negative_title_head">Tryb negatywu</string>
+    <string name="mdnie_negative_summary_head">Włącz/wyłącz odwrócone kolory</string>
+    <string name="mdnie_outdoor_title_head">Tryb plenerowy</string>
+    <string name="mdnie_outdoor_summary_head">Aktywuj/deaktywuj tryb plenerowy</string>
+    <string name="panel_gamma_title_head">Poziom gamma ekranu</string>
+    <string name="panel_gamma_summary_head">Ustaw poziom gamma ekranu</string>
+
+    <string name="touchscreen_subcat_title">Ekran dotykowy</string>
+    <string name="touchscreen_sensitivity_title_head">Czułość ekranu dotykowego</string>
+    <string name="touchscreen_sensitivity_summary_head">Ustaw czułość ekranu dotykowego</string>
+
+    <string name="touchkey_subcat_title">Przyciski dotykowe</string>
+    <string name="touchkey_light_title_head">Włącz podświetlenie przycisków</string>
+    <string name="touchkey_light_summary_head">Podświetl przyciski kiedy ekran jest włączony</string>
+    <string name="touchkey_timeout_title_head">Opóźnienie podświetlenia</string>
+    <string name="touchkey_timeout_summary_head">Opóźnienie wyłączenia podświetlenia po naciśnięciu przycisku</string>
+
+    <string name="category_sensors_title">Czujniki</string>
+    <string name="accelerometer_subcat_title">Akcelerometr</string>
+    <string name="use_accelerometer_calibration_title_head">Używaj danych z kalibracji</string>
+    <string name="use_accelerometer_calibration_summary_head">Używaj danych z kalibracji akcelerometru. Wykonaj kalibrację po zaznaczeniu tej opcji!</string>
+    <string name="calibrate_accelerometer_title_head">Kalibruj</string>
+    <string name="calibrate_accelerometer_summary_head">Połóż telefon na płaskiej powierzchni i naciśnij to, aby skalibrować</string>
+    <string name="accelerometer_dialog_head">Skalibrowano</string>
+    <string name="accelerometer_dialog_message">Akcelerometr został poprawnie skalibrowany.</string>
+
+    <string name="category_haptic_title">Dotyk</string>
+    <string name="vibrator_subcat_title">Wibracje</string>
+    <string name="vibrator_intensity_title_head">Intensywność wibracji</string>
+    <string name="vibrator_intensity_summary_head">Ustaw intensywność wibracji</string>
+
+    <string name="category_radio_title">Radio</string>
+    <string name="hspa_title_head">HSPA</string>
+    <string name="hspa_summary_head">Aktywuj HSDPA/HSUPA</string>
+
+    <string name="category_dock_title">Stacja dokująca</string>
+    <string name="dockaudio_subcat_title">Dźwięk w stacji dokującej</string>
+    <string name="use_dock_audio_title_head">Użyj stacji dokującej</string>
+    <string name="use_dock_audio_summary_head">Użyj pasywnego wyjścia audio w stacji dokującej</string>
+</resources>
diff --git a/DeviceSettings/res/values-pt-rBR/arrays.xml b/DeviceSettings/res/values-pt-rBR/arrays.xml
new file mode 100644
index 0000000..accfd51
--- /dev/null
+++ b/DeviceSettings/res/values-pt-rBR/arrays.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="mdnie_scenario_entries">
+        <item>CyanogenMod (Padrão)</item>
+        <item>IU</item>
+        <item>Vídeo</item>
+        <item>Vídeo Quente</item>
+        <item>Vídeo Frio</item>
+        <item>Câmera</item>
+        <item>Navegação</item>
+        <item>Galeria</item>
+        <item>VT</item>
+    </string-array>
+
+    <string-array name="mdnie_mode_entries">
+        <item>Dinâmico</item>
+        <item>Padrão (Padrão)</item>
+        <item>Natural</item>
+        <item>Filme</item>
+    </string-array>
+  <string-array name="mdnie_negative_entries">
+      <item>Normal</item>
+      <item>Invertido</item>
+  </string-array>
+  <string-array name="mdnie_outdoor_entries">
+      <item>Desligado (Padrão)</item>
+      <item>Ligado</item>
+  </string-array>
+  <string-array name="panel_gamma_entries">
+      <item>2.2 (Padrão)</item>
+      <item>1.9</item>
+  </string-array>
+  <string-array name="touchscreen_sensitivity_entries">
+      <item>10</item>
+      <item>20</item>
+      <item>30</item>
+      <item>50 (Padrão)</item>
+      <item>70</item>
+      <item>100</item>
+  </string-array>
+  <string-array name="vibrator_intensity_entries">
+      <item>0%</item>
+      <item>25%</item>
+      <item>50% (Padrão)</item>
+      <item>75%</item>
+      <item>100%</item>
+  </string-array>
+  <string-array name="hspa_entries">
+      <item>Somente UMTS</item>
+      <item>Somente HSDPA</item>
+      <item>HSDPA + HSUPA</item>
+  </string-array>
+  <string-array name="touchkey_timeout_entries">
+      <item>Nunca</item>
+      <item>1 segundo</item>
+      <item>2 segundos</item>
+      <item>3 segundos (padrão)</item>
+      <item>4 segundos</item>
+      <item>5 segundos</item>
+      <item>6 segundos</item>
+  </string-array>
+</resources>
diff --git a/DeviceSettings/res/values-pt-rBR/strings.xml b/DeviceSettings/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..1748a7b
--- /dev/null
+++ b/DeviceSettings/res/values-pt-rBR/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Configurações avançadas</string>
+    <string name="screen_colors_title">Cores</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>
+    <string name="mdnie_mode_summary_head">Define o Modo mDNIe</string>
+    <string name="mdnie_negative_title_head">Modo Negativo</string>
+    <string name="mdnie_negative_summary_head">Ativa/Desativa cores invertidas</string>
+    <string name="mdnie_outdoor_title_head">Modo Ao Ar Livre</string>
+    <string name="mdnie_outdoor_summary_head">Ativa/Desativa modo ao ar livre</string>
+    <string name="panel_gamma_title_head">Gama da Tela</string>
+    <string name="panel_gamma_summary_head">Define valor da gama da tela</string>
+    <string name="touchscreen_subcat_title">Tela sensível ao toque</string>
+    <string name="touchscreen_sensitivity_title_head">Sensitividade do toque</string>
+    <string name="touchscreen_sensitivity_summary_head">Define a sensitividade do toque na tela</string>
+    <string name="touchkey_subcat_title">Tecla sensível ao toque</string>
+    <string name="touchkey_light_title_head">Ativar luz de fundo das teclas</string>
+    <string name="touchkey_light_summary_head">Acender as teclas sensíveis ao toque quando a tela estiver ligada</string>
+    <string name="touchkey_timeout_title_head">Tempo limite da luz de fundo</string>
+    <string name="touchkey_timeout_summary_head">Quanto tempo a luz de fundo irá ficar acesa depois do botão ser pressionado</string>
+    <string name="category_sensors_title">Sensores</string>
+    <string name="category_haptic_title">Resposta Tátil</string>
+    <string name="vibrator_subcat_title">Vibração</string>
+    <string name="vibrator_intensity_title_head">Intensidade da Vibração</string>
+    <string name="vibrator_intensity_summary_head">Define a intensidade da vibração</string>
+    <string name="category_radio_title">Rádio</string>
+    <string name="hspa_title_head">HSPA</string>
+    <string name="hspa_summary_head">Ativa HSDPA/HSUPA</string>
+    <string name="category_screen_title">Tela</string>
+    <string name="accelerometer_subcat_title">Acelerômetro</string>
+    <string name="use_accelerometer_calibration_title_head">Usar dados de calibragem</string>
+    <string name="use_accelerometer_calibration_summary_head">Usa os valores dos dados de calibragem. Calibre após marcar isto!</string>
+    <string name="calibrate_accelerometer_title_head">Calibrar</string>
+    <string name="calibrate_accelerometer_summary_head">Coloque seu telefone em uma superfície plana, e pressione isto para calibrar</string>
+    <string name="accelerometer_dialog_head">Calibragem terminada</string>
+    <string name="accelerometer_dialog_message">O sensor foi calibrado com sucesso.</string>
+    <string name="category_dock_title">Dock</string>
+    <string name="dockaudio_subcat_title">Áudio</string>
+    <string name="use_dock_audio_title_head">Usar áudio USB do dock</string>
+    <string name="use_dock_audio_summary_head">Usar a saída de áudio passiva no dock</string>
+</resources>
\ No newline at end of file
diff --git a/DeviceSettings/res/values-ru/arrays.xml b/DeviceSettings/res/values-ru/arrays.xml
new file mode 100644
index 0000000..f3ff76f
--- /dev/null
+++ b/DeviceSettings/res/values-ru/arrays.xml
@@ -0,0 +1,68 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string-array name="mdnie_scenario_entries">
+        <item>CyanogenMod (По умолч.)</item>
+        <item>Видео</item>
+        <item>Видео (тёпл.)</item>
+        <item>Видео (хол.)</item>
+        <item>Камера</item>
+        <item>Навигация</item>
+        <item>Галерея</item>
+        <item>VT</item>
+    </string-array>
+
+    <string-array name="mdnie_mode_entries">
+        <item>Динамический</item>
+        <item>Стандартный (По умолч.)</item>
+        <item>Натуральный</item>
+        <item>Кино</item>
+    </string-array>
+
+    <string-array name="mdnie_negative_entries">
+        <item>Выкл. (По умолчанию)</item>
+        <item>Вкл.</item>
+    </string-array>
+
+    <string-array name="mdnie_outdoor_entries">
+        <item>Выкл. (По умолчанию)</item>
+        <item>Вкл.</item>
+    </string-array>
+
+    <string-array name="panel_gamma_entries">
+        <item>2.2 (По умолчанию)</item>
+        <item>1.9</item>
+    </string-array>
+
+    <string-array name="touchscreen_sensitivity_entries">
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+        <item>50 (По умолчанию)</item>
+        <item>70</item>
+        <item>100</item>
+    </string-array>
+
+    <string-array name="vibrator_intensity_entries">
+        <item>0%</item>
+        <item>25%</item>
+        <item>50% (По умолчанию)</item>
+        <item>75%</item>
+        <item>100%</item>
+    </string-array>
+
+    <string-array name="hspa_entries">
+        <item>Только UMTS</item>
+        <item>Только HSDPA</item>
+        <item>HSDPA + HSUPA</item>
+    </string-array>
+
+    <string-array name="touchkey_timeout_entries">
+        <item>Никогда</item>
+        <item>1 секунда</item>
+        <item>2 секунды</item>
+        <item>3 секунды (По умолчанию)</item>
+        <item>4 секунды</item>
+        <item>5 секунд</item>
+        <item>6 секунд</item>
+    </string-array>
+</resources>
diff --git a/DeviceSettings/res/values-ru/strings.xml b/DeviceSettings/res/values-ru/strings.xml
new file mode 100644
index 0000000..85fa4e1
--- /dev/null
+++ b/DeviceSettings/res/values-ru/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Advanced settings</string>
+
+    <string name="category_screen_title">Экран</string>
+    <string name="screen_colors_title">Цвета</string>
+    <string name="mdnie_scenario_title_head">Сценарий</string>
+    <string name="mdnie_scenario_summary_head">Установка сценария mDNIe</string>
+    <string name="mdnie_mode_title_head">Режим</string>
+    <string name="mdnie_mode_summary_head">Установка режима mDNIe</string>
+    <string name="mdnie_negative_title_head">Инверсия</string>
+    <string name="mdnie_negative_summary_head">Включить/Выключить инверсию цветов</string>
+    <string name="mdnie_outdoor_title_head">Повышенная яркость</string>
+    <string name="mdnie_outdoor_summary_head">Включить/Выключить режим повышенной яркости</string>
+    <string name="panel_gamma_title_head">Гамма</string>
+    <string name="panel_gamma_summary_head">Установка значения цветовой гаммы</string>
+
+    <string name="touchscreen_subcat_title">Сенсорный экран</string>
+    <string name="touchscreen_sensitivity_title_head">Чувствительность</string>
+    <string name="touchscreen_sensitivity_summary_head">Установка чувствительности сенсорного экрана</string>
+
+    <string name="touchkey_subcat_title">Сенсорные кнопки</string>
+    <string name="touchkey_light_title_head">Подсветка кнопок</string>
+    <string name="touchkey_light_summary_head">Включать подсветку сенсорных кнопок при включённом экране</string>
+    <string name="touchkey_timeout_title_head">Тайм-аут подсветки</string>
+    <string name="touchkey_timeout_summary_head">Время до выключения подсветки после последнего нажатия на кнопки</string>
+
+    <string name="category_sensors_title">Датчики</string>
+    <string name="accelerometer_subcat_title">Акселерометр</string>
+    <string name="use_accelerometer_calibration_title_head">Использовать данные калибровки</string>
+    <string name="use_accelerometer_calibration_summary_head">Использовать откалиброванные значения. Необходимо выполнить калибровку!</string>
+    <string name="calibrate_accelerometer_title_head">Калибровка</string>
+    <string name="calibrate_accelerometer_summary_head">Положите телефон на ровную поверхность и нажмите эту кнопку.</string>
+    <string name="accelerometer_dialog_head">Калибровка выполнена</string>
+    <string name="accelerometer_dialog_message">Датчик успешно откалиброван</string>
+
+    <string name="category_haptic_title">Отклик</string>
+    <string name="vibrator_subcat_title">Вибрация</string>
+    <string name="vibrator_intensity_title_head">Интенсивность вибрации</string>
+    <string name="vibrator_intensity_summary_head">Установка интенсивности вибрации</string>
+
+    <string name="category_radio_title">Модем</string>
+    <string name="hspa_title_head">HSPA</string>
+    <string name="hspa_summary_head">Включить HSDPA/HSUPA</string>
+
+    <string name="category_dock_title">Док-станция</string>
+    <string name="dockaudio_subcat_title">Аудио</string>
+    <string name="use_dock_audio_title_head">USB аудио док-станция</string>
+    <string name="use_dock_audio_summary_head">Использовать пассивный режим аудио док-станции</string>
+</resources>
diff --git a/DeviceSettings/res/values-zh-rCN/arrays.xml b/DeviceSettings/res/values-zh-rCN/arrays.xml
new file mode 100644
index 0000000..849e1f2
--- /dev/null
+++ b/DeviceSettings/res/values-zh-rCN/arrays.xml
@@ -0,0 +1,86 @@
+<?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.
+ -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string-array name="mdnie_scenario_entries">
+        <item>CyanogenMod (默认)</item>
+        <item>界面</item>
+        <item>影片</item>
+        <item>影片 (温)</item>
+        <item>影片 (冷)</item>
+        <item>相机</item>
+        <item>导航</item>
+        <item>图库</item>
+        <item>VT</item>
+    </string-array>
+
+    <string-array name="mdnie_mode_entries">
+        <item>动态</item>
+        <item>标准 (默认)</item>
+        <item>自然</item>
+        <item>电影</item>
+    </string-array>
+
+    <string-array name="mdnie_negative_entries">
+        <item>正常</item>
+        <item>反色</item>
+    </string-array>
+
+    <string-array name="mdnie_outdoor_entries">
+        <item>禁用 (默认)</item>
+        <item>启用</item>
+    </string-array>
+
+    <string-array name="panel_gamma_entries">
+        <item>2.2 (默认)</item>
+        <item>1.9</item>
+    </string-array>
+
+    <string-array name="touchscreen_sensitivity_entries">
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+        <item>50 (默认)</item>
+        <item>70</item>
+        <item>100</item>
+    </string-array>
+
+    <string-array name="vibrator_intensity_entries">
+        <item>0%</item>
+        <item>25%</item>
+        <item>50% (默认)</item>
+        <item>75%</item>
+        <item>100%</item>
+    </string-array>
+
+    <string-array name="hspa_entries">
+        <item>仅使用 UMTS</item>
+        <item>仅使用 HSDPA</item>
+        <item>使用 HSDPA + HSUPA</item>
+    </string-array>
+
+    <string-array name="touchkey_timeout_entries">
+        <item>从不</item>
+        <item>1 秒</item>
+        <item>2 秒</item>
+        <item>3 秒 (默认)</item>
+        <item>4 秒</item>
+        <item>5 秒</item>
+        <item>6 秒</item>
+    </string-array>
+
+</resources>
diff --git a/DeviceSettings/res/values-zh-rCN/strings.xml b/DeviceSettings/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..df08dd2
--- /dev/null
+++ b/DeviceSettings/res/values-zh-rCN/strings.xml
@@ -0,0 +1,65 @@
+<?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.
+ -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">高级设置</string>
+
+    <string name="category_screen_title">屏幕</string>
+    <string name="screen_colors_title">颜色</string>
+    <string name="mdnie_scenario_title_head">场景</string>
+    <string name="mdnie_scenario_summary_head">设置 mDNIe 场景</string>
+    <string name="mdnie_mode_title_head">模式</string>
+    <string name="mdnie_mode_summary_head">设置 mDNIe 模式</string>
+    <string name="mdnie_negative_title_head">负极模式</string>
+    <string name="mdnie_negative_summary_head">启用/禁用反色</string>
+    <string name="mdnie_outdoor_title_head">户外模式</string>
+    <string name="mdnie_outdoor_summary_head">启用/禁用户外模式</string>
+    <string name="panel_gamma_title_head">屏幕珈玛</string>
+    <string name="panel_gamma_summary_head">设置屏幕珈玛</string>
+
+    <string name="touchscreen_subcat_title">触摸屏</string>
+    <string name="touchscreen_sensitivity_title_head">触摸屏灵敏度</string>
+    <string name="touchscreen_sensitivity_summary_head">设置触摸屏灵敏度</string>
+
+    <string name="touchkey_subcat_title">触摸键</string>
+    <string name="touchkey_light_title_head">启用触摸键背光灯</string>
+    <string name="touchkey_light_summary_head">屏幕开启时触摸键将会点亮</string>
+    <string name="touchkey_timeout_title_head">背光灯超时</string>
+    <string name="touchkey_timeout_summary_head">设置背光灯超时时间</string>
+
+    <string name="category_sensors_title">感应器</string>
+    <string name="accelerometer_subcat_title">加速规</string>
+    <string name="use_accelerometer_calibration_title_head">使用校准数据</string>
+    <string name="use_accelerometer_calibration_summary_head">使用加速规的校准数据。请在检查此之后重新校准！</string>
+    <string name="calibrate_accelerometer_title_head">校准</string>
+    <string name="calibrate_accelerometer_summary_head">把手机放在平面上，然后点击此按键进行校准</string>
+    <string name="accelerometer_dialog_head">校准完成</string>
+    <string name="accelerometer_dialog_message">感应器已被成功的校准。</string>
+
+    <string name="category_haptic_title">振动</string>
+    <string name="vibrator_subcat_title">振动器</string>
+    <string name="vibrator_intensity_title_head">振动器强度</string>
+    <string name="vibrator_intensity_summary_head">设置振动器强度</string>
+
+    <string name="category_radio_title">无线电</string>
+    <string name="hspa_title_head">HSPA</string>
+    <string name="hspa_summary_head">启用 HSDPA/HSUPA</string>
+
+    <string name="category_dock_title">基座</string>
+    <string name="dockaudio_subcat_title">音频</string>
+    <string name="use_dock_audio_title_head">使用基座的 USB 音频</string>
+    <string name="use_dock_audio_summary_head">使用基座上的被动音频输出</string>
+</resources>
diff --git a/DeviceSettings/res/values/arrays.xml b/DeviceSettings/res/values/arrays.xml
new file mode 100644
index 0000000..6a659f8
--- /dev/null
+++ b/DeviceSettings/res/values/arrays.xml
@@ -0,0 +1,137 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string-array name="mdnie_scenario_entries">
+        <item>CyanogenMod (Default)</item>
+        <item>UI</item>
+        <item>Video</item>
+        <item>Video Warm</item>
+        <item>Video Cold</item>
+        <item>Camera</item>
+        <item>Navigation</item>
+        <item>Gallery</item>
+        <item>VT</item>
+    </string-array>
+
+    <string-array name="mdnie_scenario_entries_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+    </string-array>
+
+    <string-array name="mdnie_mode_entries">
+        <item>Dynamic</item>
+        <item>Standard (Default)</item>
+        <item>Natural</item>
+        <item>Movie</item>
+    </string-array>
+
+    <string-array name="mdnie_mode_entries_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+    <string-array name="mdnie_negative_entries">
+        <item>Normal</item>
+        <item>Inverted</item>
+    </string-array>
+
+    <string-array name="mdnie_negative_entries_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
+    <string-array name="mdnie_outdoor_entries">
+        <item>Off (Default)</item>
+        <item>On</item>
+    </string-array>
+
+    <string-array name="mdnie_outdoor_entries_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
+    <string-array name="panel_gamma_entries">
+        <item>2.2 (Default)</item>
+        <item>1.9</item>
+    </string-array>
+
+    <string-array name="panel_gamma_entries_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
+    <string-array name="touchscreen_sensitivity_entries">
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+        <item>50 (Default)</item>
+        <item>70</item>
+        <item>100</item>
+    </string-array>
+
+    <string-array name="touchscreen_sensitivity_entries_values" translatable="false">
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+        <item>50</item>
+        <item>70</item>
+        <item>100</item>
+    </string-array>
+
+    <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="touchkey_timeout_entries">
+            <item>Never</item>
+            <item>1 second</item>
+            <item>2 seconds</item>
+            <item>3 seconds (Default)</item>
+            <item>4 seconds</item>
+            <item>5 seconds</item>
+            <item>6 seconds</item>
+    </string-array>
+
+    <string-array name="touchkey_timeout_entries_values" translatable="false">
+            <item>0</item>
+            <item>1</item>
+            <item>2</item>
+            <item>3</item>
+            <item>4</item>
+            <item>5</item>
+            <item>6</item>
+    </string-array>
+
+</resources>
diff --git a/DeviceSettings/res/values/strings.xml b/DeviceSettings/res/values/strings.xml
new file mode 100644
index 0000000..a848541
--- /dev/null
+++ b/DeviceSettings/res/values/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Advanced settings</string>
+
+    <string name="category_screen_title">Screen</string>
+    <string name="screen_colors_title">Colors</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>
+    <string name="mdnie_mode_summary_head">Set the mDNIe Mode</string>
+    <string name="mdnie_negative_title_head">Negative Mode</string>
+    <string name="mdnie_negative_summary_head">Enable/Disable inverted colors</string>
+    <string name="mdnie_outdoor_title_head">Outdoor Mode</string>
+    <string name="mdnie_outdoor_summary_head">Enable/Disable outdoor mode</string>
+    <string name="panel_gamma_title_head">Screen Gamma</string>
+    <string name="panel_gamma_summary_head">Set screen gamma value</string>
+
+    <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="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>
+    <string name="vibrator_intensity_title_head">Vibrator Intensity</string>
+    <string name="vibrator_intensity_summary_head">Set vibrator intensity</string>
+
+    <string name="category_radio_title">Radio</string>
+    <string name="hspa_title_head">HSPA</string>
+    <string name="hspa_summary_head">Enable 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/xml/dock_preferences.xml b/DeviceSettings/res/xml/dock_preferences.xml
new file mode 100644
index 0000000..5f5fdf4
--- /dev/null
+++ b/DeviceSettings/res/xml/dock_preferences.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory 
+                android:title="@string/dockaudio_subcat_title">
+    <!-- Use Dock Audio -->
+    <CheckBoxPreference
+                android:key="dock_audio"
+                android:title="@string/use_dock_audio_title_head"
+                android:summary="@string/use_dock_audio_summary_head"
+                />
+    </PreferenceCategory>
+</PreferenceScreen>
+
diff --git a/DeviceSettings/res/xml/haptic_preferences.xml b/DeviceSettings/res/xml/haptic_preferences.xml
new file mode 100644
index 0000000..31c0e21
--- /dev/null
+++ b/DeviceSettings/res/xml/haptic_preferences.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
+                android:title="@string/vibrator_subcat_title">
+    <com.cyanogenmod.settings.device.VibratorIntensity
+                android:key="vibrator_intensity"
+                android:title="@string/vibrator_intensity_title_head"
+                android:summary="@string/vibrator_intensity_summary_head"
+                android:entries="@array/vibrator_intensity_entries"
+                android:entryValues="@array/vibrator_intensity_entries_values"
+                android:defaultValue="50" />
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/DeviceSettings/res/xml/radio_preferences.xml b/DeviceSettings/res/xml/radio_preferences.xml
new file mode 100644
index 0000000..b78ecde
--- /dev/null
+++ b/DeviceSettings/res/xml/radio_preferences.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Hspa modes -->
+    <com.cyanogenmod.settings.device.Hspa
+                android:key="hspa"
+                android:title="@string/hspa_title_head"
+                android:summary="@string/hspa_summary_head"
+                android:entries="@array/hspa_entries"
+                        android:entryValues="@array/hspa_entries_values"
+                        android:defaultValue="0" />
+
+</PreferenceScreen>
diff --git a/DeviceSettings/res/xml/screen_preferences.xml b/DeviceSettings/res/xml/screen_preferences.xml
new file mode 100644
index 0000000..d053bbd
--- /dev/null
+++ b/DeviceSettings/res/xml/screen_preferences.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/app_name">
+
+    <PreferenceCategory
+                android:title="@string/screen_colors_title">
+    
+    <!-- mDNIe Scenario modes -->
+    <com.cyanogenmod.settings.device.mDNIeScenario
+	        android:key="mdnie_scenario"
+	        android:title="@string/mdnie_scenario_title_head"
+	        android:summary="@string/mdnie_scenario_summary_head"
+	        android:entries="@array/mdnie_scenario_entries"
+  			android:entryValues="@array/mdnie_scenario_entries_values"
+  			android:defaultValue="0" />
+
+    <!-- mDNIe Mode -->
+    <com.cyanogenmod.settings.device.mDNIeMode
+	        android:key="mdnie_mode"
+	        android:title="@string/mdnie_mode_title_head"
+	        android:summary="@string/mdnie_mode_summary_head"
+	        android:entries="@array/mdnie_mode_entries"
+  			android:entryValues="@array/mdnie_mode_entries_values"
+  			android:defaultValue="1" />
+
+    <!-- mDNIe Negative mode -->
+    <com.cyanogenmod.settings.device.mDNIeNegative
+	        android:key="mdnie_negative"
+	        android:title="@string/mdnie_negative_title_head"
+	        android:summary="@string/mdnie_negative_summary_head"
+	        android:entries="@array/mdnie_negative_entries"
+  			android:entryValues="@array/mdnie_negative_entries_values"
+  			android:defaultValue="0" />
+
+    <!-- mDNIe Outdoor mode -->
+    <com.cyanogenmod.settings.device.mDNIeOutdoor
+	        android:key="mdnie_outdoor"
+	        android:title="@string/mdnie_outdoor_title_head"
+	        android:summary="@string/mdnie_outdoor_summary_head"
+	        android:entries="@array/mdnie_outdoor_entries"
+  			android:entryValues="@array/mdnie_outdoor_entries_values"
+  			android:defaultValue="0" />
+
+    <!-- Panel gamma -->
+    <com.cyanogenmod.settings.device.PanelGamma
+                android:key="panel_gamma"
+                android:title="@string/panel_gamma_title_head"
+                android:summary="@string/panel_gamma_summary_head"
+                android:entries="@array/panel_gamma_entries"
+                        android:entryValues="@array/panel_gamma_entries_values"
+                        android:defaultValue="0" />
+
+    </PreferenceCategory>
+    <PreferenceCategory
+                android:title="@string/touchscreen_subcat_title">
+    <com.cyanogenmod.settings.device.TouchscreenSensitivity
+                android:key="touchscreen_sensitivity"
+                android:title="@string/touchscreen_sensitivity_title_head"
+                android:summary="@string/touchscreen_sensitivity_summary_head"
+                android:entries="@array/touchscreen_sensitivity_entries"
+                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
new file mode 100644
index 0000000..8c61e07
--- /dev/null
+++ b/DeviceSettings/res/xml/sensors_preferences.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory 
+                android:title="@string/accelerometer_subcat_title">
+    <!-- Use sensor calibration -->
+    <CheckBoxPreference
+                android:key="use_accelerometer_calibration"
+                android:title="@string/use_accelerometer_calibration_title_head"
+                android:summary="@string/use_accelerometer_calibration_summary_head"
+                />
+
+    <!-- Do accelerometer calibration -->
+    <Preference
+                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
new file mode 100644
index 0000000..7f7970c
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import android.app.ActionBar;
+import android.app.ActionBar.Tab;
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentTransaction;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
+import android.support.v13.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+
+import com.cyanogenmod.settings.device.R;
+
+import java.util.ArrayList;
+
+public class DeviceSettings extends FragmentActivity {
+
+    public static final String SHARED_PREFERENCES_BASENAME = "com.cyanogenmod.settings.device";
+    public static final String ACTION_UPDATE_PREFERENCES = "com.cyanogenmod.settings.device.UPDATE";
+    public static final String KEY_MDNIE_SCENARIO = "mdnie_scenario";
+    public static final String KEY_MDNIE_MODE = "mdnie_mode";
+    public static final String KEY_MDNIE_NEGATIVE = "mdnie_negative";
+    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_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";
+    public static final String KEY_VIBRATOR_INTENSITY = "vibrator_intensity";
+    public static final String KEY_USE_DOCK_AUDIO = "dock_audio";
+
+    ViewPager mViewPager;
+    TabsAdapter mTabsAdapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mViewPager = new ViewPager(this);
+        mViewPager.setId(R.id.viewPager);
+        setContentView(mViewPager);
+
+        final ActionBar bar = getActionBar();
+        bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+        bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE, ActionBar.DISPLAY_SHOW_TITLE);
+        bar.setTitle(R.string.app_name);
+
+        mTabsAdapter = new TabsAdapter(this, mViewPager);
+        mTabsAdapter.addTab(bar.newTab().setText(R.string.category_radio_title),
+                RadioFragmentActivity.class, null);
+        mTabsAdapter.addTab(bar.newTab().setText(R.string.category_screen_title),
+                ScreenFragmentActivity.class, null);
+        mTabsAdapter.addTab(bar.newTab().setText(R.string.category_sensors_title),
+                SensorsFragmentActivity.class, null);
+        mTabsAdapter.addTab(bar.newTab().setText(R.string.category_haptic_title),
+                HapticFragmentActivity.class, null);
+        mTabsAdapter.addTab(bar.newTab().setText(R.string.category_dock_title),
+                DockFragmentActivity.class, null);
+
+        if (savedInstanceState != null) {
+            bar.setSelectedNavigationItem(savedInstanceState.getInt("tab", 0));
+        }
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt("tab", getActionBar().getSelectedNavigationIndex());
+    }
+
+    public static class TabsAdapter extends FragmentPagerAdapter
+            implements ActionBar.TabListener, ViewPager.OnPageChangeListener {
+        private final Context mContext;
+        private final ActionBar mActionBar;
+        private final ViewPager mViewPager;
+        private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>();
+
+        static final class TabInfo {
+            private final Class<?> clss;
+            private final Bundle args;
+
+            TabInfo(Class<?> _class, Bundle _args) {
+                clss = _class;
+                args = _args;
+            }
+        }
+
+        public TabsAdapter(Activity activity, ViewPager pager) {
+            super(activity.getFragmentManager());
+            mContext = activity;
+            mActionBar = activity.getActionBar();
+            mViewPager = pager;
+            mViewPager.setAdapter(this);
+            mViewPager.setOnPageChangeListener(this);
+        }
+
+        public void addTab(ActionBar.Tab tab, Class<?> clss, Bundle args) {
+            TabInfo info = new TabInfo(clss, args);
+            tab.setTag(info);
+            tab.setTabListener(this);
+            mTabs.add(info);
+            mActionBar.addTab(tab);
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public int getCount() {
+            return mTabs.size();
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            TabInfo info = mTabs.get(position);
+            return Fragment.instantiate(mContext, info.clss.getName(), info.args);
+        }
+
+        public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+        }
+
+        public void onPageSelected(int position) {
+            mActionBar.setSelectedNavigationItem(position);
+        }
+
+        public void onPageScrollStateChanged(int state) {
+        }
+
+        public void onTabSelected(Tab tab, FragmentTransaction ft) {
+            Object tag = tab.getTag();
+            for (int i=0; i<mTabs.size(); i++) {
+                if (mTabs.get(i) == tag) {
+                    mViewPager.setCurrentItem(i);
+                }
+            }
+        }
+
+        public void onTabUnselected(Tab tab, FragmentTransaction ft) {
+        }
+
+        public void onTabReselected(Tab tab, FragmentTransaction ft) {
+        }
+    }
+}
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/DockFragmentActivity.java b/DeviceSettings/src/com/cyanogenmod/settings/device/DockFragmentActivity.java
new file mode 100644
index 0000000..bfeb280
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/DockFragmentActivity.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import android.app.ActivityManagerNative;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+
+import com.cyanogenmod.settings.device.R;
+
+public class DockFragmentActivity extends PreferenceFragment {
+
+    private static final String PREF_ENABLED = "1";
+    private static final String TAG = "DeviceSettings_Dock";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.dock_preferences);
+        PreferenceScreen prefSet = getPreferenceScreen();
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+
+        String boxValue;
+        String key = preference.getKey();
+
+        Log.w(TAG, "key: " + key);
+
+        if (key.compareTo(DeviceSettings.KEY_USE_DOCK_AUDIO) == 0) {
+            boxValue = (((CheckBoxPreference)preference).isChecked() ? "1" : "0");
+            Intent i = new Intent("com.cyanogenmod.settings.SamsungDock");
+            i.putExtra("data", boxValue);
+            ActivityManagerNative.broadcastStickyIntent(i, null, UserHandle.USER_ALL);
+        }
+        return true;
+    }
+
+    public static void restore(Context context) {
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        boolean dockAudio = sharedPrefs.getBoolean(DeviceSettings.KEY_USE_DOCK_AUDIO, false);
+        Intent i = new Intent("com.cyanogenmod.settings.SamsungDock");
+        i.putExtra("data", (dockAudio? "1" : "0"));
+        ActivityManagerNative.broadcastStickyIntent(i, null, UserHandle.USER_ALL);
+    }
+}
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/HapticFragmentActivity.java b/DeviceSettings/src/com/cyanogenmod/settings/device/HapticFragmentActivity.java
new file mode 100644
index 0000000..176d80a
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/HapticFragmentActivity.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+
+import com.cyanogenmod.settings.device.R;
+
+public class HapticFragmentActivity extends PreferenceFragment {
+
+    private static final String PREF_ENABLED = "1";
+    private static final String TAG = "DeviceSettings_Haptic";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.haptic_preferences);
+
+        PreferenceScreen prefSet = getPreferenceScreen();
+
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+
+        String boxValue;
+        String key = preference.getKey();
+
+        Log.w(TAG, "key: " + key);
+
+        return true;
+    }
+
+    public static boolean isSupported(String FILE) {
+        return Utils.fileExists(FILE);
+    }
+
+    public static void restore(Context context) {
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+    }
+}
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/Hspa.java b/DeviceSettings/src/com/cyanogenmod/settings/device/Hspa.java
new file mode 100644
index 0000000..f19eff7
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/Hspa.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.util.AttributeSet;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceManager;
+
+public class Hspa extends ListPreference implements OnPreferenceChangeListener {
+
+    private static final String FILE = "/system/app/SamsungServiceMode.apk";
+    private Context mCtx;
+
+    public Hspa(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.setOnPreferenceChangeListener(this);
+        mCtx = context;
+    }
+
+    public static boolean isSupported() {
+        return Utils.fileExists(FILE);
+    }
+
+    /**
+     * Restore hspa setting from SharedPreferences. (Write to kernel.)
+     * @param context       The context to read the SharedPreferences from
+     */
+    public static void restore(Context context) {
+        if (!isSupported()) {
+            return;
+        }
+
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        sendIntent(context, sharedPrefs.getString(DeviceSettings.KEY_HSPA, "23"));
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        sendIntent(mCtx, (String) newValue);
+        return true;
+    }
+
+    private static void sendIntent(Context context, String value) {
+        Intent i = new Intent("com.cyanogenmod.SamsungServiceMode.EXECUTE");
+        i.putExtra("sub_type", 20); // HSPA Setting
+        i.putExtra("data", value);
+        context.sendBroadcast(i);
+    }
+}
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/PanelGamma.java b/DeviceSettings/src/com/cyanogenmod/settings/device/PanelGamma.java
new file mode 100644
index 0000000..81544a6
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/PanelGamma.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import android.content.Context;
+import android.util.Log;
+import android.content.SharedPreferences;
+import android.util.AttributeSet;
+import android.preference.Preference;
+import android.preference.ListPreference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceManager;
+
+public class PanelGamma extends ListPreference implements OnPreferenceChangeListener {
+
+    public PanelGamma(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.setOnPreferenceChangeListener(this);
+    }
+
+    private static final String FILE = "/sys/class/lcd/panel/gamma_mode";
+
+    public static boolean isSupported() {
+        return Utils.fileExists(FILE);
+    }
+
+    /**
+     * Restore panel gamma setting from SharedPreferences. (Write to kernel.)
+     * @param context       The context to read the SharedPreferences from
+     */
+    public static void restore(Context context) {
+        if (!isSupported()) {
+            return;
+        }
+
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        Utils.writeValue(FILE, sharedPrefs.getString(DeviceSettings.KEY_PANEL_GAMMA, "0"));
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        Log.d("SGS2","Writing " + ((String)newValue) + " to " + FILE);
+        Utils.writeValue(FILE, (String) newValue);
+        return true;
+    }
+
+}
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/RadioFragmentActivity.java b/DeviceSettings/src/com/cyanogenmod/settings/device/RadioFragmentActivity.java
new file mode 100644
index 0000000..d094ef2
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/RadioFragmentActivity.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+
+import com.cyanogenmod.settings.device.R;
+
+public class RadioFragmentActivity extends PreferenceFragment {
+
+    private static final String PREF_ENABLED = "1";
+    private static final String TAG = "DeviceSettings_Radio";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.radio_preferences);
+
+        PreferenceScreen prefSet = getPreferenceScreen();
+
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+
+        String boxValue;
+        String key = preference.getKey();
+
+        Log.w(TAG, "key: " + key);
+
+        return true;
+    }
+
+    public static boolean isSupported(String FILE) {
+        return Utils.fileExists(FILE);
+    }
+
+    public static void restore(Context context) {
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+    }
+}
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java b/DeviceSettings/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java
new file mode 100755
index 0000000..9ba40f7
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+import com.cyanogenmod.settings.device.R;
+
+public class ScreenFragmentActivity extends PreferenceFragment {
+
+    private static final String PREF_ENABLED = "1";
+    private static final String TAG = "DeviceSettings_Screen";
+
+    private static final String FILE_TOUCHKEY_DISABLE = "/sys/class/sec/sec_touchkey/force_disable";
+    private static final String FILE_TOUCHKEY_BRIGHTNESS = "/sys/class/sec/sec_touchkey/brightness";
+
+    private mDNIeScenario mmDNIeScenario;
+    private mDNIeMode mmDNIeMode;
+    private mDNIeNegative mmDNIeNegative;
+    private mDNIeOutdoor mmDNIeOutdoor;
+    private PanelGamma mPanelGamma;
+    private TouchscreenSensitivity mTouchscreenSensitivity;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.screen_preferences);
+        PreferenceScreen prefSet = getPreferenceScreen();
+
+        mmDNIeScenario = (mDNIeScenario) findPreference(DeviceSettings.KEY_MDNIE_SCENARIO);
+        mmDNIeScenario.setEnabled(mDNIeScenario.isSupported());
+
+        mmDNIeMode = (mDNIeMode) findPreference(DeviceSettings.KEY_MDNIE_MODE);
+        mmDNIeMode.setEnabled(mDNIeMode.isSupported());
+
+        mmDNIeNegative = (mDNIeNegative) findPreference(DeviceSettings.KEY_MDNIE_NEGATIVE);
+        mmDNIeNegative.setEnabled(mDNIeNegative.isSupported());
+
+        mmDNIeOutdoor = (mDNIeOutdoor) findPreference(DeviceSettings.KEY_MDNIE_OUTDOOR);
+        mmDNIeOutdoor.setEnabled(mDNIeOutdoor.isSupported());
+
+        mPanelGamma = (PanelGamma) findPreference(DeviceSettings.KEY_PANEL_GAMMA);
+        mPanelGamma.setEnabled(mPanelGamma.isSupported());
+
+        mTouchscreenSensitivity = (TouchscreenSensitivity) findPreference(DeviceSettings.KEY_TOUCHSCREEN_SENSITIVITY);
+        mTouchscreenSensitivity.setEnabled(mTouchscreenSensitivity.isSupported());
+
+        if (((CheckBoxPreference)prefSet.findPreference(DeviceSettings.KEY_TOUCHKEY_LIGHT)).isChecked()) {
+            prefSet.findPreference(DeviceSettings.KEY_TOUCHKEY_TIMEOUT).setEnabled(true);
+        } else {
+            prefSet.findPreference(DeviceSettings.KEY_TOUCHKEY_TIMEOUT).setEnabled(false);
+        }
+    }
+    
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+
+        String key = preference.getKey();
+
+        Log.w(TAG, "key: " + key);
+
+        if (key.compareTo(DeviceSettings.KEY_TOUCHKEY_LIGHT) == 0) {
+            if (((CheckBoxPreference)preference).isChecked()) {
+                Utils.writeValue(FILE_TOUCHKEY_DISABLE, "0");
+                Utils.writeValue(FILE_TOUCHKEY_BRIGHTNESS, "1");
+                preferenceScreen.findPreference(DeviceSettings.KEY_TOUCHKEY_TIMEOUT).setEnabled(true);
+            } else {
+                Utils.writeValue(FILE_TOUCHKEY_DISABLE, "1");
+                Utils.writeValue(FILE_TOUCHKEY_BRIGHTNESS, "2");
+                preferenceScreen.findPreference(DeviceSettings.KEY_TOUCHKEY_TIMEOUT).setEnabled(false);
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean isSupported(String FILE) {
+        return Utils.fileExists(FILE);
+    }
+
+    public static void restore(Context context) {
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        boolean light = sharedPrefs.getBoolean(DeviceSettings.KEY_TOUCHKEY_LIGHT, true);
+
+        Utils.writeValue(FILE_TOUCHKEY_DISABLE, light ? "0" : "1");
+        Utils.writeValue(FILE_TOUCHKEY_BRIGHTNESS, light ? "1" : "2");
+    }
+}
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java b/DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java
new file mode 100644
index 0000000..eed6b8e
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+
+import com.cyanogenmod.settings.device.R;
+
+public class SensorsFragmentActivity extends PreferenceFragment {
+
+    private static final String PREF_ENABLED = "1";
+    private static final String TAG = "DeviceSettings_Sensors";
+
+    private static final String FILE_USE_ACCELEROMETER_CALIB = "/sys/class/sec/gsensorcal/calibration";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.sensors_preferences);
+        PreferenceScreen prefSet = getPreferenceScreen();
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+
+        String boxValue;
+        String key = preference.getKey();
+
+        Log.w(TAG, "key: " + key);
+
+        if (key.compareTo(DeviceSettings.KEY_USE_ACCELEROMETER_CALIBRATION) == 0) {
+            boxValue = (((CheckBoxPreference)preference).isChecked() ? "1" : "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_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;
+    }
+
+    public static boolean isSupported(String FILE) {
+        return Utils.fileExists(FILE);
+    }
+
+    public static void restore(Context context) {
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        boolean accelerometerCalib = sharedPrefs.getBoolean(DeviceSettings.KEY_USE_ACCELEROMETER_CALIBRATION, true);
+
+        // 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 (!accelerometerCalib)
+            Utils.writeValue(FILE_USE_ACCELEROMETER_CALIB, "0");
+    }
+}
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/Startup.java b/DeviceSettings/src/com/cyanogenmod/settings/device/Startup.java
new file mode 100644
index 0000000..5296d76
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/Startup.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class Startup extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(final Context context, final Intent bootintent) {
+        DockFragmentActivity.restore(context);
+        HapticFragmentActivity.restore(context);
+        mDNIeScenario.restore(context);
+        mDNIeMode.restore(context);
+        mDNIeNegative.restore(context);
+        mDNIeOutdoor.restore(context);
+        RadioFragmentActivity.restore(context);
+        ScreenFragmentActivity.restore(context);
+        SensorsFragmentActivity.restore(context);
+        TouchkeyTimeout.restore(context);
+        VibratorIntensity.restore(context);
+    }
+}
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/TouchkeyTimeout.java b/DeviceSettings/src/com/cyanogenmod/settings/device/TouchkeyTimeout.java
new file mode 100644
index 0000000..6ea9bfb
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/TouchkeyTimeout.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import java.io.IOException;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.content.SharedPreferences;
+import android.preference.Preference;
+import android.preference.ListPreference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceManager;
+
+public class TouchkeyTimeout extends ListPreference implements OnPreferenceChangeListener {
+
+    public TouchkeyTimeout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.setOnPreferenceChangeListener(this);
+    }
+
+    private static final String FILE_TOUCHKEY_TIMEOUT = "/sys/class/sec/sec_touchkey/timeout";
+
+    public static boolean isSupported() {
+        return Utils.fileExists(FILE_TOUCHKEY_TIMEOUT);
+    }
+
+    /**
+     * Restore touchscreen sensitivity setting from SharedPreferences. (Write to kernel.)
+     * @param context       The context to read the SharedPreferences from
+     */
+    public static void restore(Context context) {
+        if (!isSupported()) {
+            return;
+        }
+
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        Utils.writeValue(FILE_TOUCHKEY_TIMEOUT, sharedPrefs.getString(DeviceSettings.KEY_TOUCHKEY_TIMEOUT, "3"));
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        Utils.writeValue(FILE_TOUCHKEY_TIMEOUT, (String) newValue);
+        return true;
+    }
+
+}
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/TouchscreenSensitivity.java b/DeviceSettings/src/com/cyanogenmod/settings/device/TouchscreenSensitivity.java
new file mode 100644
index 0000000..e066556
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/TouchscreenSensitivity.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import java.io.IOException;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.content.SharedPreferences;
+import android.preference.Preference;
+import android.preference.ListPreference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceManager;
+
+public class TouchscreenSensitivity extends ListPreference implements OnPreferenceChangeListener {
+
+    public TouchscreenSensitivity(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.setOnPreferenceChangeListener(this);
+    }
+
+    private static final String FILE = "/sys/class/sec/sec_touchscreen/tsp_threshold";
+
+    public static boolean isSupported() {
+        return Utils.fileExists(FILE);
+    }
+
+    /**
+     * Restore touchscreen sensitivity setting from SharedPreferences. (Write to kernel.)
+     * @param context       The context to read the SharedPreferences from
+     */
+    public static void restore(Context context) {
+        if (!isSupported()) {
+            return;
+        }
+
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        Utils.writeValue(FILE, sharedPrefs.getString(DeviceSettings.KEY_TOUCHSCREEN_SENSITIVITY, "50"));
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        Utils.writeValue(FILE, (String) newValue);
+        return true;
+    }
+
+}
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/Utils.java b/DeviceSettings/src/com/cyanogenmod/settings/device/Utils.java
new file mode 100644
index 0000000..bd8eb65
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/Utils.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.SyncFailedException;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Context;
+
+public class Utils {
+
+    private static final String TAG = "DeviceSettings_Utils";
+    private static final String TAG_READ = "DeviceSettings_Utils_Read";
+    private static final String TAG_WRITE = "DeviceSettings_Utils_Write";
+
+    /**
+     * Write a string value to the specified file.
+     * 
+     * @param filename The filename
+     * @param value The value
+     */
+    public static void writeValue(String filename, String value) {
+        FileOutputStream fos = null;
+        try {
+            fos = new FileOutputStream(new File(filename), false);
+            fos.write(value.getBytes());
+            fos.flush();
+            // fos.getFD().sync();
+        } catch (FileNotFoundException ex) {
+            Log.w(TAG, "file " + filename + " not found: " + ex);
+        } catch (SyncFailedException ex) {
+            Log.w(TAG, "file " + filename + " sync failed: " + ex);
+        } catch (IOException ex) {
+            Log.w(TAG, "IOException trying to sync " + filename + ": " + ex);
+        } catch (RuntimeException ex) {
+            Log.w(TAG, "exception while syncing file: ", ex);
+        } finally {
+            if (fos != null) {
+                try {
+                    Log.w(TAG_WRITE, "file " + filename + ": " + value);
+                    fos.close();
+                } catch (IOException ex) {
+                    Log.w(TAG, "IOException while closing synced file: ", ex);
+                } catch (RuntimeException ex) {
+                    Log.w(TAG, "exception while closing file: ", ex);
+                }
+            }
+        }
+
+    }
+
+    /**
+     * Write a string value to the specified file.
+     * 
+     * @param filename The filename
+     * @param value The value
+     */
+    public static void writeValue(String filename, Boolean value) {
+        FileOutputStream fos = null;
+        String sEnvia;
+        try {
+            fos = new FileOutputStream(new File(filename), false);
+            if (value)
+                sEnvia = "1";
+            else
+                sEnvia = "0";
+            fos.write(sEnvia.getBytes());
+            fos.flush();
+            // fos.getFD().sync();
+        } catch (FileNotFoundException ex) {
+            Log.w(TAG, "file " + filename + " not found: " + ex);
+        } catch (SyncFailedException ex) {
+            Log.w(TAG, "file " + filename + " sync failed: " + ex);
+        } catch (IOException ex) {
+            Log.w(TAG, "IOException trying to sync " + filename + ": " + ex);
+        } catch (RuntimeException ex) {
+            Log.w(TAG, "exception while syncing file: ", ex);
+        } finally {
+            if (fos != null) {
+                try {
+                    Log.w(TAG_WRITE, "file " + filename + ": " + value);
+                    fos.close();
+                } catch (IOException ex) {
+                    Log.w(TAG, "IOException while closing synced file: ", ex);
+                } catch (RuntimeException ex) {
+                    Log.w(TAG, "exception while closing file: ", ex);
+                }
+            }
+        }
+    }
+
+    /**
+     * Write the "color value" to the specified file. The value is scaled from
+     * an integer to an unsigned integer by multiplying by 2.
+     * @param filename      The filename
+     * @param value         The value of max value Integer.MAX
+     */
+    public static void writeColor(String filename, int value) {
+        writeValue(filename, String.valueOf((long) value * 2));
+    }
+
+    /**
+     * Check if the specified file exists.
+     * @param filename      The filename
+     * @return              Whether the file exists or not
+     */
+    public static boolean fileExists(String filename) {
+        return new File(filename).exists();
+    }
+
+
+    public static void showDialog(Context ctx, String title, String message) {
+        final AlertDialog alertDialog = new AlertDialog.Builder(ctx).create();
+        alertDialog.setTitle(title);
+        alertDialog.setMessage(message);
+        alertDialog.setButton("OK", new DialogInterface.OnClickListener() {
+           public void onClick(DialogInterface dialog, int which) {
+              alertDialog.dismiss();
+           }
+        });
+        alertDialog.show();
+    }
+}
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/VibratorIntensity.java b/DeviceSettings/src/com/cyanogenmod/settings/device/VibratorIntensity.java
new file mode 100644
index 0000000..7a809a5
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/VibratorIntensity.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import java.io.IOException;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.content.SharedPreferences;
+import android.preference.Preference;
+import android.preference.ListPreference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceManager;
+
+public class VibratorIntensity extends ListPreference implements OnPreferenceChangeListener {
+
+    public VibratorIntensity(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.setOnPreferenceChangeListener(this);
+    }
+
+    private static final String FILE = "/sys/vibrator/pwm_val";
+
+    public static boolean isSupported() {
+        return Utils.fileExists(FILE);
+    }
+
+    /**
+     * Restore vibrator intensity setting from SharedPreferences. (Write to kernel.)
+     * @param context       The context to read the SharedPreferences from
+     */
+    public static void restore(Context context) {
+        if (!isSupported()) {
+            return;
+        }
+
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        Utils.writeValue(FILE, sharedPrefs.getString(DeviceSettings.KEY_VIBRATOR_INTENSITY, "50"));
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        Utils.writeValue(FILE, (String) newValue);
+        return true;
+    }
+
+}
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeMode.java b/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeMode.java
new file mode 100644
index 0000000..c7fc94b
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeMode.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import android.content.Context;
+
+import android.content.SharedPreferences;
+import android.util.AttributeSet;
+import android.preference.Preference;
+import android.preference.ListPreference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceManager;
+
+public class mDNIeMode extends ListPreference implements OnPreferenceChangeListener {
+
+    public mDNIeMode(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.setOnPreferenceChangeListener(this);
+    }
+
+    private static final String FILE = "/sys/class/mdnie/mdnie/mode";
+
+    public static boolean isSupported() {
+        return Utils.fileExists(FILE);
+    }
+
+    /**
+     * Restore mdnie user mode setting from SharedPreferences. (Write to kernel.)
+     * @param context       The context to read the SharedPreferences from
+     */
+    public static void restore(Context context) {
+        if (!isSupported()) {
+            return;
+        }
+
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        Utils.writeValue(FILE, sharedPrefs.getString(DeviceSettings.KEY_MDNIE_MODE, "1"));
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        Utils.writeValue(FILE, (String) newValue);
+        return true;
+    }
+
+}
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeNegative.java b/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeNegative.java
new file mode 100644
index 0000000..c2ccc7b
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeNegative.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import java.io.IOException;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.content.SharedPreferences;
+import android.preference.Preference;
+import android.preference.ListPreference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceManager;
+
+public class mDNIeNegative extends ListPreference implements OnPreferenceChangeListener {
+
+    public mDNIeNegative(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.setOnPreferenceChangeListener(this);
+    }
+
+    private static final String FILE = "/sys/class/mdnie/mdnie/negative";
+
+    public static boolean isSupported() {
+        return Utils.fileExists(FILE);
+    }
+
+    /**
+     * Restore mdnie user mode setting from SharedPreferences. (Write to kernel.)
+     * @param context       The context to read the SharedPreferences from
+     */
+    public static void restore(Context context) {
+        if (!isSupported()) {
+            return;
+        }
+
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        Utils.writeValue(FILE, sharedPrefs.getString(DeviceSettings.KEY_MDNIE_NEGATIVE, "0"));
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        Utils.writeValue(FILE, (String) newValue);
+        return true;
+    }
+
+}
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeOutdoor.java b/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeOutdoor.java
new file mode 100644
index 0000000..7fcdacd
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeOutdoor.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.content.SharedPreferences;
+import android.preference.Preference;
+import android.preference.ListPreference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceManager;
+
+public class mDNIeOutdoor extends ListPreference implements OnPreferenceChangeListener {
+
+    public mDNIeOutdoor(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.setOnPreferenceChangeListener(this);
+    }
+
+    private static final String FILE = "/sys/class/mdnie/mdnie/outdoor";
+
+    public static boolean isSupported() {
+        return Utils.fileExists(FILE);
+    }
+
+    /**
+     * Restore mdnie user mode setting from SharedPreferences. (Write to kernel.)
+     * @param context       The context to read the SharedPreferences from
+     */
+    public static void restore(Context context) {
+        if (!isSupported()) {
+            return;
+        }
+
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        Utils.writeValue(FILE, sharedPrefs.getString(DeviceSettings.KEY_MDNIE_OUTDOOR, "0"));
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        Utils.writeValue(FILE, (String) newValue);
+        return true;
+    }
+
+}
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeScenario.java b/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeScenario.java
new file mode 100644
index 0000000..a9c935a
--- /dev/null
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeScenario.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.cyanogenmod.settings.device;
+
+import android.content.Context;
+
+import android.content.SharedPreferences;
+import android.util.AttributeSet;
+import android.preference.Preference;
+import android.preference.ListPreference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceManager;
+
+public class mDNIeScenario extends ListPreference implements OnPreferenceChangeListener {
+
+    public mDNIeScenario(Context context, AttributeSet attrs) {
+        super(context,attrs);
+        this.setOnPreferenceChangeListener(this);
+    }
+
+    private static final String FILE = "/sys/class/mdnie/mdnie/scenario";
+
+    public static boolean isSupported() {
+        return Utils.fileExists(FILE);
+    }
+
+    /**
+     * Restore mdnie "camera" setting from SharedPreferences. (Write to kernel.)
+     * @param context       The context to read the SharedPreferences from
+     */
+    public static void restore(Context context) {
+        if (!isSupported()) {
+            return;
+        }
+
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        Utils.writeValue(FILE, sharedPrefs.getString(DeviceSettings.KEY_MDNIE_SCENARIO, "0"));
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        Utils.writeValue(FILE, (String) newValue);
+        return true;
+    }
+
+}