i9100: switch to smdk4412 kernel

Change-Id: I9f614c4a23503c8b14daebf7996b076fcd264db8

18 files changed, 88 insertions, 75 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index a85a3b6..45e0e6b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -25,11 +25,11 @@ TARGET_BOARD_INFO_FILE := device/samsung/i9100/board-info.txt
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/i9100/bluetooth
 
 # Inline kernel building
-TARGET_KERNEL_SOURCE := kernel/samsung/smdk4210
+TARGET_KERNEL_SOURCE := kernel/samsung/smdk4412
 TARGET_KERNEL_CONFIG := cyanogenmod_i9100_defconfig
 
 TARGET_SPECIFIC_HEADER_PATH += device/samsung/i9100/overlay/include
-EXYNOS4210_ENHANCEMENTS := true
+
 # assert
 TARGET_OTA_ASSERT_DEVICE := galaxys2,i9100,GT-I9100,GT-I9100M,GT-I9100P,GT-I9100T
 
diff --git a/DeviceSettings/res/values-da/arrays.xml b/DeviceSettings/res/values-da/arrays.xml
index d3aa9d2..2a63d1e 100644
--- a/DeviceSettings/res/values-da/arrays.xml
+++ b/DeviceSettings/res/values-da/arrays.xml
@@ -1,19 +1,20 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <string-array name="mdnie_scenario_entries">
-        <item>Kamera (Standard)</item>
+        <item>CyanogenMod (Standard)</item>
+        <item>UI</item>
         <item>Video</item>
         <item>Varm Video</item>
         <item>Kold Video</item>
-        <item>UI</item>
+        <item>Kamera</item>
         <item>Navigation</item>
         <item>Galleri</item>
         <item>VT</item>
     </string-array>
 
    <string-array name="mdnie_mode_entries">
-        <item>Standard</item>
         <item>Dynamisk</item>
+        <item>Standard (Standard)</item>
         <item>Naturlig</item>
         <item>Film</item>
     </string-array>
diff --git a/DeviceSettings/res/values-de/arrays.xml b/DeviceSettings/res/values-de/arrays.xml
index 04797c6..d3cc471 100644
--- a/DeviceSettings/res/values-de/arrays.xml
+++ b/DeviceSettings/res/values-de/arrays.xml
@@ -1,19 +1,20 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <string-array name="mdnie_scenario_entries">
-        <item>Kamera (Standard)</item>
+        <item>CyanogenMod (Standard)</item>
+        <item>UI</item>
         <item>Video</item>
         <item>Video warm</item>
         <item>Video kalt</item>
-        <item>UI</item>
+        <item>Kamera</item>
         <item>Navigation</item>
         <item>Gallerie</item>
         <item>VT</item>
     </string-array>
 
     <string-array name="mdnie_mode_entries">
-        <item>Standard</item>
         <item>Dynamisch</item>
+        <item>Standard (Standard)</item>
         <item>Natürlich</item>
         <item>Film</item>
     </string-array>
diff --git a/DeviceSettings/res/values-es/arrays.xml b/DeviceSettings/res/values-es/arrays.xml
index 2642011..412100c 100644
--- a/DeviceSettings/res/values-es/arrays.xml
+++ b/DeviceSettings/res/values-es/arrays.xml
@@ -1,17 +1,18 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string-array name="mdnie_scenario_entries">
-        <item>Cámara (por defecto)</item>
+        <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>UI</item>
+        <item>Camara</item>
         <item>Navegación</item>
         <item>Galería</item>
         <item>VT</item>
     </string-array>
     <string-array name="mdnie_mode_entries">
-        <item>Estándar (por defecto)</item>
         <item>Dinámico</item>
+        <item>Estándar (por defecto)</item>
         <item>Natural</item>
         <item>Película</item>
     </string-array>
diff --git a/DeviceSettings/res/values-fi/arrays.xml b/DeviceSettings/res/values-fi/arrays.xml
index 6db9aa8..e954025 100644
--- a/DeviceSettings/res/values-fi/arrays.xml
+++ b/DeviceSettings/res/values-fi/arrays.xml
@@ -1,19 +1,20 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <string-array name="mdnie_scenario_entries">
-        <item>Kamera (Oletus)</item>
+        <item>CyanogenMod (Oletus)</item>
+        <item>Käyttöliittymä</item>
         <item>Video</item>
         <item>Video(Lämmin)</item>
         <item>Video(Kylmä)</item>
-        <item>Käyttöliittymä</item>
+        <item>Kamera</item>
         <item>Navigointi</item>
         <item>Galleria</item>
         <item>VT</item>
     </string-array>
 
     <string-array name="mdnie_mode_entries">
-        <item>Standardi (Oletus)</item>
         <item>Dynaaminen</item>
+        <item>Standardi (Oletus)</item>
         <item>Luonnollinen</item>
         <item>Elokuva</item>
     </string-array>
diff --git a/DeviceSettings/res/values-fr/arrays.xml b/DeviceSettings/res/values-fr/arrays.xml
index a3a2ada..84e3f65 100644
--- a/DeviceSettings/res/values-fr/arrays.xml
+++ b/DeviceSettings/res/values-fr/arrays.xml
@@ -16,18 +16,19 @@
 
 <resources>
     <string-array name="mdnie_scenario_entries">
-        <item>Caméra (Défaut)</item>
+        <item>CyanogenMod (Défaut)</item>
+        <item>UI</item>
         <item>Vidéo</item>
         <item>Vidéo chaude</item>
         <item>Vidéo froide</item>
-        <item>UI</item>
+        <item>Caméra</item>
         <item>Navigation</item>
         <item>Galerie</item>
         <item>VT</item>
     </string-array>
     <string-array name="mdnie_mode_entries">
-        <item>Standard (Défaut)</item>
         <item>Dynamique</item>
+        <item>Standard (Défaut)</item>
         <item>Naturel</item>
         <item>Vidéo</item>
     </string-array>
@@ -52,7 +53,7 @@
         <item>100</item>
     </string-array>
     <string-array name="vibrator_intensity_entries">
-        <item>0%</item>
+        <item>Désactivé</item>
         <item>25%</item>
         <item>50% (Défaut)</item>
         <item>75%</item>
@@ -64,7 +65,7 @@
         <item>HSDPA + HSUPA</item>
     </string-array>
     <string-array name="touchkey_timeout_entries">
-        <item>Jamais</item>
+        <item>Désactivé</item>
         <item>1 seconde</item>
         <item>2 secondes</item>
         <item>3 secondes (Défaut)</item>
diff --git a/DeviceSettings/res/values-fr/strings.xml b/DeviceSettings/res/values-fr/strings.xml
index e866ca9..f4ad532 100644
--- a/DeviceSettings/res/values-fr/strings.xml
+++ b/DeviceSettings/res/values-fr/strings.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2013 The CyanogenMod Project
+<?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.
@@ -14,7 +14,7 @@
      limitations under the License.
  -->
 
-<resources>
+<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>
@@ -31,17 +31,17 @@
     <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">Tactile</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 lorsque l\'écran est activé</string>
-    <string name="touchkey_timeout_title_head">Temps avant extinction</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">Mettez votre téléphone sur une surface plane et appuyez ici pour 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>
@@ -52,7 +52,7 @@
     <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">Sortie audio</string>
-    <string name="use_dock_audio_title_head">Sortie audio passive</string>
-    <string name="use_dock_audio_summary_head">Utiliser la sortie audio passive de la 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
index bab1ea5..3363918 100644
--- a/DeviceSettings/res/values-hu/arrays.xml
+++ b/DeviceSettings/res/values-hu/arrays.xml
@@ -1,19 +1,20 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <string-array name="mdnie_scenario_entries">
-        <item>Kamera (Alapbeállítás)</item>
+        <item>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>Felhasználói felület</item>
+        <item>Kamera</item>
         <item>Navigáció</item>
         <item>Galéria</item>
         <item>VT</item>
     </string-array>
 
     <string-array name="mdnie_mode_entries">
-        <item>Hagyományos (Alapbeállítás)</item>
         <item>Dinamikus</item>
+        <item>Hagyományos (Alapbeállítás)</item>
         <item>Természetes</item>
         <item>Film</item>
     </string-array>
diff --git a/DeviceSettings/res/values-nl/arrays.xml b/DeviceSettings/res/values-nl/arrays.xml
index 8dff499..52fb181 100644
--- a/DeviceSettings/res/values-nl/arrays.xml
+++ b/DeviceSettings/res/values-nl/arrays.xml
@@ -15,18 +15,19 @@
  -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string-array name="mdnie_scenario_entries">
-        <item>Camera (standaard)</item>
+        <item>CyanogenMod (Standaard)</item>
+        <item>Uiterlijk</item>
         <item>Video</item>
         <item>Video (warm)</item>
         <item>Video (koud)</item>
-        <item>Uiterlijk</item>
+        <item>Camera</item>
         <item>Navigatie</item>
         <item>Galerij</item>
         <item>VT</item>
     </string-array>
     <string-array name="mdnie_mode_entries">
-        <item>Standaard</item>
         <item>Dynamisch</item>
+        <item>Standaard (Standaard)</item>
         <item>Natuurlijk</item>
         <item>Film</item>
     </string-array>
diff --git a/DeviceSettings/res/values-pl/arrays.xml b/DeviceSettings/res/values-pl/arrays.xml
index 45286a5..e9554f1 100644
--- a/DeviceSettings/res/values-pl/arrays.xml
+++ b/DeviceSettings/res/values-pl/arrays.xml
@@ -1,19 +1,20 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <string-array name="mdnie_scenario_entries">
-        <item>Kamera (domyślnie)</item>
+        <item>CyanogenMod (domyślnie)</item>
+        <item>UI</item>
         <item>Wideo</item>
         <item>Ciepły film</item>
         <item>Zimny film</item>
-        <item>UI</item>
+        <item>Kamera</item>
         <item>Nawigacja</item>
         <item>Galeria</item>
         <item>VT</item>
     </string-array>
 
     <string-array name="mdnie_mode_entries">
-        <item>Dynamicznie (domyślnie)</item>
-        <item>Standardowo</item>
+        <item>Dynamicznie</item>
+        <item>Standardowo (domyślnie)</item>
         <item>Naturalnie</item>
         <item>Film</item>
     </string-array>
diff --git a/DeviceSettings/res/values-pt-rBR/arrays.xml b/DeviceSettings/res/values-pt-rBR/arrays.xml
index 3e634d0..accfd51 100644
--- a/DeviceSettings/res/values-pt-rBR/arrays.xml
+++ b/DeviceSettings/res/values-pt-rBR/arrays.xml
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string-array name="mdnie_scenario_entries">
-      <item>Câmera (Padrão)</item>
-      <item>Vídeo</item>
-      <item>Vídeo Quente</item>
-      <item>Vídeo Frio</item>
-      <item>IU</item>
-      <item>Navegação</item>
-      <item>Galeria</item>
-      <item>VT</item>
-  </string-array>
-  <string-array name="mdnie_mode_entries">
-      <item>Padrão</item>
-      <item>Dinâmico</item>
-      <item>Natural</item>
-      <item>Filme</item>
-  </string-array>
+    <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>
@@ -57,4 +59,4 @@
       <item>5 segundos</item>
       <item>6 segundos</item>
   </string-array>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/DeviceSettings/res/values-ru/arrays.xml b/DeviceSettings/res/values-ru/arrays.xml
index 074cedb..f3ff76f 100644
--- a/DeviceSettings/res/values-ru/arrays.xml
+++ b/DeviceSettings/res/values-ru/arrays.xml
@@ -1,20 +1,20 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <string-array name="mdnie_scenario_entries">
-        <item>Камера (По умолч.)</item>
+        <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>
+        <item>Натуральный</item>
         <item>Кино</item>
     </string-array>
 
diff --git a/DeviceSettings/res/values-zh-rCN/arrays.xml b/DeviceSettings/res/values-zh-rCN/arrays.xml
index c55b540..849e1f2 100644
--- a/DeviceSettings/res/values-zh-rCN/arrays.xml
+++ b/DeviceSettings/res/values-zh-rCN/arrays.xml
@@ -17,19 +17,20 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <string-array name="mdnie_scenario_entries">
-        <item>照相 (默认)</item>
+        <item>CyanogenMod (默认)</item>
+        <item>界面</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>
         <item>电影</item>
     </string-array>
diff --git a/DeviceSettings/res/values/arrays.xml b/DeviceSettings/res/values/arrays.xml
index 4ee28de..6a659f8 100644
--- a/DeviceSettings/res/values/arrays.xml
+++ b/DeviceSettings/res/values/arrays.xml
@@ -1,37 +1,39 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <string-array name="mdnie_scenario_entries">
-        <item>Camera (Default)</item>
+        <item>CyanogenMod (Default)</item>
+        <item>UI</item>
         <item>Video</item>
         <item>Video Warm</item>
         <item>Video Cold</item>
-        <item>UI</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>4</item>
+        <item>0</item>
         <item>1</item>
         <item>2</item>
         <item>3</item>
-        <item>0</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>Standard (Default)</item>
         <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>1</item>
         <item>0</item>
+        <item>1</item>
         <item>2</item>
         <item>3</item>
     </string-array>
@@ -116,7 +118,7 @@
             <item>Never</item>
             <item>1 second</item>
             <item>2 seconds</item>
-            <item>3 seconds (default)</item>
+            <item>3 seconds (Default)</item>
             <item>4 seconds</item>
             <item>5 seconds</item>
             <item>6 seconds</item>
diff --git a/DeviceSettings/res/xml/screen_preferences.xml b/DeviceSettings/res/xml/screen_preferences.xml
index 0b5b54b..d053bbd 100644
--- a/DeviceSettings/res/xml/screen_preferences.xml
+++ b/DeviceSettings/res/xml/screen_preferences.xml
@@ -12,7 +12,7 @@
 	        android:summary="@string/mdnie_scenario_summary_head"
 	        android:entries="@array/mdnie_scenario_entries"
   			android:entryValues="@array/mdnie_scenario_entries_values"
-  			android:defaultValue="4" />
+  			android:defaultValue="0" />
 
     <!-- mDNIe Mode -->
     <com.cyanogenmod.settings.device.mDNIeMode
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/TouchkeyTimeout.java b/DeviceSettings/src/com/cyanogenmod/settings/device/TouchkeyTimeout.java
index ce741f8..6ea9bfb 100644
--- a/DeviceSettings/src/com/cyanogenmod/settings/device/TouchkeyTimeout.java
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/TouchkeyTimeout.java
@@ -32,7 +32,7 @@ public class TouchkeyTimeout extends ListPreference implements OnPreferenceChang
         this.setOnPreferenceChangeListener(this);
     }
 
-    private static final String FILE_TOUCHKEY_TIMEOUT = "/sys/class/sec/sec_touchkey/led_timeout";
+    private static final String FILE_TOUCHKEY_TIMEOUT = "/sys/class/sec/sec_touchkey/timeout";
 
     public static boolean isSupported() {
         return Utils.fileExists(FILE_TOUCHKEY_TIMEOUT);
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeScenario.java b/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeScenario.java
index 0557ba3..a9c935a 100644
--- a/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeScenario.java
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeScenario.java
@@ -48,7 +48,7 @@ public class mDNIeScenario extends ListPreference implements OnPreferenceChangeL
         }
 
         SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
-        Utils.writeValue(FILE, sharedPrefs.getString(DeviceSettings.KEY_MDNIE_SCENARIO, "4"));
+        Utils.writeValue(FILE, sharedPrefs.getString(DeviceSettings.KEY_MDNIE_SCENARIO, "0"));
     }
 
     public boolean onPreferenceChange(Preference preference, Object newValue) {
diff --git a/cm.dependencies b/cm.dependencies
index a8be07c..22f30b5 100644
--- a/cm.dependencies
+++ b/cm.dependencies
@@ -4,8 +4,8 @@
         "target_path": "device/samsung/galaxys2-common"
     },
     {
-        "repository": "android_kernel_samsung_smdk4210",
-        "target_path": "kernel/samsung/smdk4210"
+        "repository": "android_kernel_samsung_smdk4412",
+        "target_path": "kernel/samsung/smdk4412"
     },
     {
         "repository": "android_hardware_samsung",