summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-05-21 18:06:00 +0200
committerDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-05-25 11:10:05 +0200
commit0f00ea64fa266647d5db30e9aef921bfe9ba8b5e (patch)
tree53d20cf7ff56f7d76519d900bea43d4e5290e996
parent91be5c15179cd4232d355b611b2dc15efba5ddf9 (diff)
downloaddevice_samsung_n7000-0f00ea64fa266647d5db30e9aef921bfe9ba8b5e.zip
device_samsung_n7000-0f00ea64fa266647d5db30e9aef921bfe9ba8b5e.tar.gz
device_samsung_n7000-0f00ea64fa266647d5db30e9aef921bfe9ba8b5e.tar.bz2
n7000: switch to smdk4412 kernel
Change-Id: I414ab233a71d0910a0a61fd7eb0bd8893bd5ce2a
-rw-r--r--BoardConfig.mk4
-rw-r--r--DeviceSettings/res/values-de/arrays.xml7
-rw-r--r--DeviceSettings/res/values-es/arrays.xml29
-rw-r--r--DeviceSettings/res/values-fi/arrays.xml70
-rw-r--r--DeviceSettings/res/values-fr/arrays.xml11
-rw-r--r--DeviceSettings/res/values-fr/strings.xml7
-rw-r--r--DeviceSettings/res/values-hu/arrays.xml70
-rw-r--r--DeviceSettings/res/values-nl/arrays.xml75
-rw-r--r--DeviceSettings/res/values-pt-rBR/arrays.xml62
-rw-r--r--DeviceSettings/res/values-ru/arrays.xml6
-rw-r--r--DeviceSettings/res/values-zh-rCN/arrays.xml7
-rw-r--r--DeviceSettings/res/values/arrays.xml16
-rw-r--r--DeviceSettings/res/xml/screen_preferences.xml2
-rw-r--r--DeviceSettings/src/com/cyanogenmod/settings/device/TouchkeyTimeout.java2
-rw-r--r--DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeScenario.java2
-rw-r--r--cm.dependencies4
16 files changed, 295 insertions, 79 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 75f79b0..62eb570 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -25,11 +25,11 @@ TARGET_BOARD_INFO_FILE := device/samsung/n7000/board-info.txt
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/n7000/bluetooth
# Inline kernel building
-TARGET_KERNEL_SOURCE := kernel/samsung/smdk4210
+TARGET_KERNEL_SOURCE := kernel/samsung/smdk4412
TARGET_KERNEL_CONFIG := cyanogenmod_n7000_defconfig
TARGET_SPECIFIC_HEADER_PATH += device/samsung/n7000/overlay/include
-EXYNOS4210_ENHANCEMENTS := true
+
# assert
TARGET_OTA_ASSERT_DEVICE := galaxynote,n7000,N7000,GT-N7000
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 230b23d..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>Video</item>
- <item>Video Cálido</item>
- <item>Video Frío</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>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>
@@ -20,8 +21,8 @@
<item>Invertido</item>
</string-array>
<string-array name="mdnie_outdoor_entries">
- <item>Desactivado (por defecto)</item>
- <item>Activado</item>
+ <item>Apagado (por defecto)</item>
+ <item>Encendido</item>
</string-array>
<string-array name="panel_gamma_entries">
<item>2,2 (por defecto)</item>
@@ -48,12 +49,12 @@
<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>
+ <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-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-fr/arrays.xml b/DeviceSettings/res/values-fr/arrays.xml
index 722b634..c40b998 100644
--- a/DeviceSettings/res/values-fr/arrays.xml
+++ b/DeviceSettings/res/values-fr/arrays.xml
@@ -15,18 +15,19 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<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>
@@ -35,8 +36,8 @@
<item>Inversé</item>
</string-array>
<string-array name="mdnie_outdoor_entries">
- <item>Désactivé (Défaut)</item>
- <item>Activé</item>
+ <item>Désactiver (Défaut)</item>
+ <item>Activer</item>
</string-array>
<string-array name="panel_gamma_entries">
<item>2.2 (Défaut)</item>
diff --git a/DeviceSettings/res/values-fr/strings.xml b/DeviceSettings/res/values-fr/strings.xml
index ea18efd..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.
@@ -12,7 +12,8 @@
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>
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-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-pt-rBR/arrays.xml b/DeviceSettings/res/values-pt-rBR/arrays.xml
index 8078ad3..accfd51 100644
--- a/DeviceSettings/res/values-pt-rBR/arrays.xml
+++ b/DeviceSettings/res/values-pt-rBR/arrays.xml
@@ -1,53 +1,43 @@
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
- <string-array name="mdnie_scenario_entries">
- <item>Câmera (Padrão)</item>
+<?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>IU</item>
+ <item>Câmera</item>
<item>Navegação</item>
<item>Galeria</item>
<item>VT</item>
- </string-array>
+ </string-array>
- <string-array name="mdnie_mode_entries">
- <item>Padrão</item>
+ <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>
<string-array name="mdnie_negative_entries">
- <item>Normal</item>
- <item>Invertido</item>
+ <item>Normal</item>
+ <item>Invertido</item>
</string-array>
-
<string-array name="mdnie_outdoor_entries">
- <item>Desligado (Padrão)</item>
- <item>Ligado</item>
+ <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>
+ <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="hspa_entries">
- <item>Somente UMTS</item>
- <item>Somente HSDPA</item>
- <item>HSDPA + HSUPA</item>
+ <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>
@@ -55,7 +45,11 @@
<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>
@@ -65,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 7d9b316..f3ff76f 100644
--- a/DeviceSettings/res/values-ru/arrays.xml
+++ b/DeviceSettings/res/values-ru/arrays.xml
@@ -1,19 +1,19 @@
<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>
</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",