diff options
| author | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-08-01 02:02:31 +0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-08-01 02:02:31 +0400 |
| commit | dcd02929bdd97300d96944c6f9683b2f3043a470 (patch) | |
| tree | 49cc6249bbc388422a361e24e62657d90a3fbe07 | |
| parent | 4180a2453a5baa8a766bf78a4554618807c03cd0 (diff) | |
| parent | 8bdae7282f5260b30382e4814dd02e21f7b644f1 (diff) | |
| download | device_samsung_i9300-dcd02929bdd97300d96944c6f9683b2f3043a470.zip device_samsung_i9300-dcd02929bdd97300d96944c6f9683b2f3043a470.tar.gz device_samsung_i9300-dcd02929bdd97300d96944c6f9683b2f3043a470.tar.bz2 | |
Merge "mdnie: cyanogenmod" into jellybean
| -rw-r--r-- | DeviceSettings/res/values-de/arrays.xml | 3 | ||||
| -rwxr-xr-x | DeviceSettings/res/values-pt-rBR/arrays.xml | 13 | ||||
| -rw-r--r-- | DeviceSettings/res/values/arrays.xml | 4 | ||||
| -rw-r--r-- | DeviceSettings/res/xml/screen_preferences.xml | 2 |
4 files changed, 16 insertions, 6 deletions
diff --git a/DeviceSettings/res/values-de/arrays.xml b/DeviceSettings/res/values-de/arrays.xml index 0052261..9edf346 100644 --- a/DeviceSettings/res/values-de/arrays.xml +++ b/DeviceSettings/res/values-de/arrays.xml @@ -15,7 +15,8 @@ </string-array> <string-array name="mdnie_scenario_entries"> - <item>UI (Standard)</item> + <item>CyanogenMod (Standard)</item> + <item>UI</item> <item>Video</item> <item>Video warm</item> <item>Video kalt</item> diff --git a/DeviceSettings/res/values-pt-rBR/arrays.xml b/DeviceSettings/res/values-pt-rBR/arrays.xml index 568bba3..7ade7ea 100755 --- a/DeviceSettings/res/values-pt-rBR/arrays.xml +++ b/DeviceSettings/res/values-pt-rBR/arrays.xml @@ -7,35 +7,42 @@ <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="mdnie_scenario_entries"> - <item>Câmera (Padrão)</item> + <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 name="mdnie_mode_entries"> <item>Padrão</item> <item>Dinâmico</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="led_fade_entries"> <item>Piscando</item> <item>Desvanecimento</item> </string-array> + <string-array name="touchkey_timeout_entries"> <item>Nunca</item> <item>1 segundo</item> @@ -45,4 +52,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/arrays.xml b/DeviceSettings/res/values/arrays.xml index 5272f09..d82ffbc 100644 --- a/DeviceSettings/res/values/arrays.xml +++ b/DeviceSettings/res/values/arrays.xml @@ -29,7 +29,8 @@ </string-array> <string-array name="mdnie_scenario_entries"> - <item>UI (Default)</item> + <item>CyanogenMod (Default)</item> + <item>UI</item> <item>Video</item> <item>Video Warm</item> <item>Video Cold</item> @@ -48,6 +49,7 @@ <item>5</item> <item>6</item> <item>7</item> + <item>8</item> </string-array> <string-array name="mdnie_mode_entries"> diff --git a/DeviceSettings/res/xml/screen_preferences.xml b/DeviceSettings/res/xml/screen_preferences.xml index e0a5f1b..aff39c0 100644 --- a/DeviceSettings/res/xml/screen_preferences.xml +++ b/DeviceSettings/res/xml/screen_preferences.xml @@ -19,7 +19,7 @@ android:summary="@string/mdnie_mode_summary_head" android:entries="@array/mdnie_mode_entries" android:entryValues="@array/mdnie_mode_entries_values" - android:defaultValue="1" /> + android:defaultValue="0" /> <!-- mDNIe Negative mode --> <com.cyanogenmod.settings.device.mDNIeNegative |