Skip to content

Commit b7af22d

Browse files
author
Daniel Hillenbrand
committed
i777: switch to smdk4412 kernel
Change-Id: I352730a4d01c6178478f84e6bb250fca0842cd15
1 parent 65cec30 commit b7af22d

File tree

23 files changed

+316
-68
lines changed

23 files changed

+316
-68
lines changed

BoardConfig.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ TARGET_BOARD_INFO_FILE := device/samsung/i777/board-info.txt
2525
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/i777/bluetooth
2626

2727
# Inline kernel building
28-
TARGET_KERNEL_SOURCE := kernel/samsung/smdk4210
28+
TARGET_KERNEL_SOURCE := kernel/samsung/smdk4412
2929
TARGET_KERNEL_CONFIG := cyanogenmod_i777_defconfig
3030

3131
TARGET_SPECIFIC_HEADER_PATH += device/samsung/i777/overlay/include
+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
2+
3+
<string-array name="mdnie_scenario_entries">
4+
<item>CyanogenMod (Standard)</item>
5+
<item>UI</item>
6+
<item>Video</item>
7+
<item>Varm Video</item>
8+
<item>Kold Video</item>
9+
<item>Kamera</item>
10+
<item>Navigation</item>
11+
<item>Galleri</item>
12+
<item>VT</item>
13+
</string-array>
14+
15+
<string-array name="mdnie_mode_entries">
16+
<item>Dynamisk</item>
17+
<item>Standard (Standard)</item>
18+
<item>Naturlig</item>
19+
<item>Film</item>
20+
</string-array>
21+
22+
<string-array name="mdnie_negative_entries">
23+
<item>Normal</item>
24+
<item>Negativ</item>
25+
</string-array>
26+
27+
<string-array name="mdnie_outdoor_entries">
28+
<item>Fra (Standard)</item>
29+
<item>Til</item>
30+
</string-array>
31+
32+
<string-array name="panel_gamma_entries">
33+
<item>2.2 (Standard)</item>
34+
<item>1.9</item>
35+
</string-array>
36+
37+
<string-array name="touchscreen_sensitivity_entries">
38+
<item>10</item>
39+
<item>20</item>
40+
<item>30</item>
41+
<item>50 (Standard)</item>
42+
<item>70</item>
43+
<item>100</item>
44+
</string-array>
45+
46+
<string-array name="vibrator_intensity_entries">
47+
<item>0%</item>
48+
<item>25%</item>
49+
<item>50% (Standard)</item>
50+
<item>75%</item>
51+
<item>100%</item>
52+
</string-array>
53+
54+
<string-array name="hspa_entries">
55+
<item>Kun UMTS</item>
56+
<item>Kun HSDPA</item>
57+
<item>HSDPA + HSUPA</item>
58+
</string-array>
59+
60+
<string-array name="touchkey_timeout_entries">
61+
<item>Aldrig</item>
62+
<item>1 sekund</item>
63+
<item>2 sekunder</item>
64+
<item>3 sekunder (Standard)</item>
65+
<item>4 sekunder</item>
66+
<item>5 sekunder</item>
67+
<item>6 sekunder</item>
68+
</string-array>
69+
</resources>
+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="app_name">Galaxy S II Indstillinger</string>
4+
5+
<string name="category_screen_title">Skærm</string>
6+
<string name="screen_colors_title">Farver</string>
7+
<string name="mdnie_scenario_title_head">Scenarie</string>
8+
<string name="mdnie_scenario_summary_head">Vælg mDNIe-scenarie</string>
9+
<string name="mdnie_mode_title_head">Tilstand</string>
10+
<string name="mdnie_mode_summary_head">Vælg mDNIe-tilstand</string>
11+
<string name="mdnie_negative_title_head">Negativ tilstand</string>
12+
<string name="mdnie_negative_summary_head">Slå negative farver til/fra</string>
13+
<string name="mdnie_outdoor_title_head">Udendørs tilstand</string>
14+
<string name="mdnie_outdoor_summary_head">Slå udendørs tilstand til/fra</string>
15+
<string name="panel_gamma_title_head">Gamma</string>
16+
<string name="panel_gamma_summary_head">Indstil gamma</string>
17+
18+
<string name="touchscreen_subcat_title">Touchscreen</string>
19+
<string name="touchscreen_sensitivity_title_head">Følsomhed</string>
20+
<string name="touchscreen_sensitivity_summary_head">Indstil skærmens følsomhed</string>
21+
22+
<string name="touchkey_subcat_title">Berøringstaster</string>
23+
<string name="touchkey_light_title_head">Brug baggrundslys</string>
24+
<string name="touchkey_light_summary_head">Lys tasterne op når skærmen er tændt</string>
25+
<string name="touchkey_timeout_title_head">Timeout</string>
26+
<string name="touchkey_timeout_summary_head">Tid før lyset slukker</string>
27+
28+
<string name="category_sensors_title">Sensorer</string>
29+
<string name="accelerometer_subcat_title">Accelerometer</string>
30+
<string name="use_accelerometer_calibration_title_head">Brug data fra kalibrering</string>
31+
<string name="use_accelerometer_calibration_summary_head">Brug værdier fra kalibrering. Udfør kalibrering efter du vælger denne!</string>
32+
<string name="calibrate_accelerometer_title_head">Kalibrér</string>
33+
<string name="calibrate_accelerometer_summary_head">Læg din telefon på en vandret overflade og tryk her for kalibrering</string>
34+
<string name="accelerometer_dialog_head">Kalibrering fuldført</string>
35+
<string name="accelerometer_dialog_message">Accelerometeret er kalibreret.</string>
36+
37+
<string name="category_haptic_title">Haptik</string>
38+
<string name="vibrator_subcat_title">Vibrator</string>
39+
<string name="vibrator_intensity_title_head">Vibrator-styrke</string>
40+
<string name="vibrator_intensity_summary_head">Indstil vibratorens intensitet</string>
41+
42+
<string name="category_radio_title">Radio</string>
43+
<string name="hspa_title_head">HSPA</string>
44+
<string name="hspa_summary_head">Slå HSDPA/HSUPA til/fra</string>
45+
46+
<string name="category_dock_title">Dock</string>
47+
<string name="dockaudio_subcat_title">Lyd</string>
48+
<string name="use_dock_audio_title_head">Brug Dockens USB lyd</string>
49+
<string name="use_dock_audio_summary_head">Spil lyden gennem dockens højttaler</string>
50+
</resources>

DeviceSettings/res/values-de/arrays.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
22

33
<string-array name="mdnie_scenario_entries">
4-
<item>Kamera (Standard)</item>
4+
<item>CyanogenMod (Standard)</item>
5+
<item>UI</item>
56
<item>Video</item>
67
<item>Video warm</item>
78
<item>Video kalt</item>
8-
<item>UI</item>
9+
<item>Kamera</item>
910
<item>Navigation</item>
1011
<item>Gallerie</item>
1112
<item>VT</item>
1213
</string-array>
1314

1415
<string-array name="mdnie_mode_entries">
15-
<item>Standard</item>
1616
<item>Dynamisch</item>
17+
<item>Standard (Standard)</item>
1718
<item>Natürlich</item>
1819
<item>Film</item>
1920
</string-array>

DeviceSettings/res/values-de/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
<string name="category_sensors_title">Sensoren</string>
2929
<string name="accelerometer_subcat_title">Beschleunigungssensor</string>
30-
<string name="use_accelerometer_calibration_title_head">Kalibierungsdaten</string>
30+
<string name="use_accelerometer_calibration_title_head">Kalibrierungsdaten</string>
3131
<string name="use_accelerometer_calibration_summary_head">Kalibrierungswerte verwenden\nNach Aktivierung bitte Kalibrierung ausführen</string>
3232
<string name="calibrate_accelerometer_title_head">Kalibrieren</string>
3333
<string name="calibrate_accelerometer_summary_head">Sensor kalibrieren\nZum Starten das Telefon auf eine horizontale, ebene Fläche legen</string>

DeviceSettings/res/values-es/arrays.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
22
<string-array name="mdnie_scenario_entries">
3-
<item>Cámara (por defecto)</item>
3+
<item>CyanogenMod (por defecto)</item>
4+
<item>UI</item>
45
<item>Vídeo</item>
56
<item>Vídeo cálido</item>
67
<item>Vídeo frío</item>
7-
<item>UI</item>
8+
<item>Camara</item>
89
<item>Navegación</item>
910
<item>Galería</item>
1011
<item>VT</item>
1112
</string-array>
1213
<string-array name="mdnie_mode_entries">
13-
<item>Estándar (por defecto)</item>
1414
<item>Dinámico</item>
15+
<item>Estándar (por defecto)</item>
1516
<item>Natural</item>
1617
<item>Película</item>
1718
</string-array>

DeviceSettings/res/values-fi/arrays.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
22

33
<string-array name="mdnie_scenario_entries">
4-
<item>Kamera (Oletus)</item>
4+
<item>CyanogenMod (Oletus)</item>
5+
<item>Käyttöliittymä</item>
56
<item>Video</item>
67
<item>Video(Lämmin)</item>
78
<item>Video(Kylmä)</item>
8-
<item>Käyttöliittymä</item>
9+
<item>Kamera</item>
910
<item>Navigointi</item>
1011
<item>Galleria</item>
1112
<item>VT</item>
1213
</string-array>
1314

1415
<string-array name="mdnie_mode_entries">
15-
<item>Standardi (Oletus)</item>
1616
<item>Dynaaminen</item>
17+
<item>Standardi (Oletus)</item>
1718
<item>Luonnollinen</item>
1819
<item>Elokuva</item>
1920
</string-array>

DeviceSettings/res/values-fr/arrays.xml

+6-5
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,19 @@
1515
-->
1616
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
1717
<string-array name="mdnie_scenario_entries">
18-
<item>Caméra (Défaut)</item>
18+
<item>CyanogenMod (Défaut)</item>
19+
<item>UI</item>
1920
<item>Vidéo</item>
2021
<item>Vidéo chaude</item>
2122
<item>Vidéo froide</item>
22-
<item>UI</item>
23+
<item>Caméra</item>
2324
<item>Navigation</item>
2425
<item>Galerie</item>
2526
<item>VT</item>
2627
</string-array>
2728
<string-array name="mdnie_mode_entries">
28-
<item>Standard (Défaut)</item>
2929
<item>Dynamique</item>
30+
<item>Standard (Défaut)</item>
3031
<item>Naturel</item>
3132
<item>Vidéo</item>
3233
</string-array>
@@ -35,8 +36,8 @@
3536
<item>Inversé</item>
3637
</string-array>
3738
<string-array name="mdnie_outdoor_entries">
38-
<item>Désactivé (Défaut)</item>
39-
<item>Activé</item>
39+
<item>Désactiver (Défaut)</item>
40+
<item>Activer</item>
4041
</string-array>
4142
<string-array name="panel_gamma_entries">
4243
<item>2.2 (Défaut)</item>

DeviceSettings/res/values-fr/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
15-
-->
15+
-->
16+
1617
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
1718
<string name="app_name">Paramètres avancés</string>
1819
<string name="category_screen_title">Écran</string>

DeviceSettings/res/values-hu/arrays.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
22

33
<string-array name="mdnie_scenario_entries">
4-
<item>Kamera (Alapbeállítás)</item>
4+
<item>CyanogenMod (Alapbeállítás)</item>
5+
<item>Felhasználói felület</item>
56
<item>Videó</item>
67
<item>Videó (Meleg árnyalat)</item>
78
<item>Videó (Hideg árnyalat)</item>
8-
<item>Felhasználói felület</item>
9+
<item>Kamera</item>
910
<item>Navigáció</item>
1011
<item>Galéria</item>
1112
<item>VT</item>
1213
</string-array>
1314

1415
<string-array name="mdnie_mode_entries">
15-
<item>Hagyományos (Alapbeállítás)</item>
1616
<item>Dinamikus</item>
17+
<item>Hagyományos (Alapbeállítás)</item>
1718
<item>Természetes</item>
1819
<item>Film</item>
1920
</string-array>

DeviceSettings/res/values-nl/arrays.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Copyright (C) 2012 The CyanogenMod Project
2+
<!-- Copyright (C) 2012-2013 The CyanogenMod Project
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -13,21 +13,21 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<resources xmlns:android="http://schemas.android.com/apk/res/android"
17-
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
16+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
1817
<string-array name="mdnie_scenario_entries">
19-
<item>Camera (standaard)</item>
18+
<item>CyanogenMod (Standaard)</item>
19+
<item>Uiterlijk</item>
2020
<item>Video</item>
2121
<item>Video (warm)</item>
2222
<item>Video (koud)</item>
23-
<item>Uiterlijk</item>
23+
<item>Camera</item>
2424
<item>Navigatie</item>
2525
<item>Galerij</item>
2626
<item>VT</item>
2727
</string-array>
2828
<string-array name="mdnie_mode_entries">
29-
<item>Standaard</item>
3029
<item>Dynamisch</item>
30+
<item>Standaard (Standaard)</item>
3131
<item>Natuurlijk</item>
3232
<item>Film</item>
3333
</string-array>

DeviceSettings/res/values-nl/strings.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Copyright (C) 2012 The CyanogenMod Project
2+
<!-- Copyright (C) 2012-2013 The CyanogenMod Project
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -13,9 +13,8 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<resources xmlns:android="http://schemas.android.com/apk/res/android"
17-
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
18-
<string name="app_name">Galaxy S II-instellingen</string>
16+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
17+
<string name="app_name">Geavanceerde instellingen</string>
1918

2019
<string name="screen_colors_title">Kleuren</string>
2120
<string name="category_screen_title">Scherm</string>

DeviceSettings/res/values-pl/arrays.xml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
22

33
<string-array name="mdnie_scenario_entries">
4-
<item>Kamera (domyślnie)</item>
4+
<item>CyanogenMod (domyślnie)</item>
5+
<item>UI</item>
56
<item>Wideo</item>
67
<item>Ciepły film</item>
78
<item>Zimny film</item>
8-
<item>UI</item>
9+
<item>Kamera</item>
910
<item>Nawigacja</item>
1011
<item>Galeria</item>
1112
<item>VT</item>
1213
</string-array>
1314

1415
<string-array name="mdnie_mode_entries">
15-
<item>Dynamicznie (domyślnie)</item>
16-
<item>Standardowo</item>
16+
<item>Dynamicznie</item>
17+
<item>Standardowo (domyślnie)</item>
1718
<item>Naturalnie</item>
1819
<item>Film</item>
1920
</string-array>
@@ -50,7 +51,7 @@
5051
<item>100%</item>
5152
</string-array>
5253

53-
<string-array name="hspa_entries">
54+
<string-array name="hspa_entries">
5455
<item>Tylko UMTS</item>
5556
<item>Tylko HSDPA</item>
5657
<item>HSDPA + HSUPA</item>

DeviceSettings/res/values-pl/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
<string name="category_sensors_title">Czujniki</string>
2929
<string name="accelerometer_subcat_title">Akcelerometr</string>
30-
<string name="use_accelerometer_calibration_title_head">Używaj danych z kalibracjih</string>
30+
<string name="use_accelerometer_calibration_title_head">Używaj danych z kalibracji</string>
3131
<string name="use_accelerometer_calibration_summary_head">Używaj danych z kalibracji akcelerometru. Wykonaj kalibrację po zaznaczeniu tej opcji!</string>
3232
<string name="calibrate_accelerometer_title_head">Kalibruj</string>
3333
<string name="calibrate_accelerometer_summary_head">Połóż telefon na płaskiej powierzchni i naciśnij to, aby skalibrować</string>

0 commit comments

Comments
 (0)