diff options
Diffstat (limited to 'DeviceSettings')
21 files changed, 521 insertions, 199 deletions
diff --git a/DeviceSettings/res/values-de/arrays.xml b/DeviceSettings/res/values-de/arrays.xml index 6f5dda7..04797c6 100644 --- a/DeviceSettings/res/values-de/arrays.xml +++ b/DeviceSettings/res/values-de/arrays.xml @@ -2,30 +2,30 @@ <string-array name="mdnie_scenario_entries"> <item>Kamera (Standard)</item> - <item>Video</item> - <item>Video warm</item> - <item>Video kalt</item> - <item>UI</item> - <item>Navigation</item> - <item>Gallerie</item> + <item>Video</item> + <item>Video warm</item> + <item>Video kalt</item> + <item>UI</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</item> + <item>Dynamisch</item> <item>Natürlich</item> - <item>Film</item> + <item>Film</item> </string-array> <string-array name="mdnie_negative_entries"> - <item>Normal</item> - <item>Invertiert</item> + <item>Normal</item> + <item>Invertiert</item> </string-array> <string-array name="mdnie_outdoor_entries"> - <item>Deaktiviert</item> - <item>Aktiviert</item> + <item>Deaktiviert</item> + <item>Aktiviert</item> </string-array> <string-array name="panel_gamma_entries"> @@ -51,9 +51,19 @@ </string-array> <string-array name="hspa_entries"> - <item>Nur UMTS</item> - <item>Nur HSDPA</item> - <item>HSDPA + HSUPA</item> + <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-es/arrays.xml b/DeviceSettings/res/values-es/arrays.xml index 3bc45b7..8cf4fd9 100644 --- a/DeviceSettings/res/values-es/arrays.xml +++ b/DeviceSettings/res/values-es/arrays.xml @@ -2,7 +2,7 @@ <string-array name="hspa_entries"> <item>Solo UMTS</item> - <item>solo HSDPA</item> + <item>Solo HSDPA</item> <item>HSDPA + HSUPA</item> </string-array> @@ -48,4 +48,11 @@ <item>100</item> </string-array> + <string-array name="vibrator_intensity_entries"> + <item>0%</item> + <item>25%</item> + <item>50% (Predeterminado)</item> + <item>75%</item> + <item>100%</item> + </string-array> </resources> diff --git a/DeviceSettings/res/values-es/strings.xml b/DeviceSettings/res/values-es/strings.xml index 95d05ca..feb29e9 100644 --- a/DeviceSettings/res/values-es/strings.xml +++ b/DeviceSettings/res/values-es/strings.xml @@ -27,8 +27,13 @@ <string name="use_gyro_calibration_title_head">Usar datos de calibración</string> <string name="use_gyro_calibration_summary_head">Usar los datos de calibración del giroscopio. ¡Calibrar despues de activar!</string> <string name="calibrate_gyro_title_head">Calibrar</string> - <string name="calibrate_gyro_summary_head">Poner el dispositivo de una superficie plana y pulsar para calibrar</string> + <string name="calibrate_gyro_summary_head">Colocar el dispositivo en una superficie plana y pulsar para calibrar</string> <string name="touchkey_subcat_title">Botones Táctiles</string> <string name="touchkey_light_title_head">Activar iluminación</string> <string name="touchkey_light_summary_head">Iluminar los botones táctiles al encender la pantalla</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 la vibración</string> </resources> diff --git a/DeviceSettings/res/values-fi/arrays.xml b/DeviceSettings/res/values-fi/arrays.xml index eeebd7a..aaa4d82 100644 --- a/DeviceSettings/res/values-fi/arrays.xml +++ b/DeviceSettings/res/values-fi/arrays.xml @@ -48,4 +48,13 @@ <item>HSDPA + HSUPA</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> + + </resources> diff --git a/DeviceSettings/res/values-fi/strings.xml b/DeviceSettings/res/values-fi/strings.xml index 188371d..081f0ef 100644 --- a/DeviceSettings/res/values-fi/strings.xml +++ b/DeviceSettings/res/values-fi/strings.xml @@ -29,6 +29,11 @@ <string name="touchkey_light_title_head">Ota näppäinvalot käyttöön</string> <string name="touchkey_light_summary_head">Valot syttyvät kun näyttö on päällä</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> diff --git a/DeviceSettings/res/values-fr/arrays.xml b/DeviceSettings/res/values-fr/arrays.xml index 124f531..d421873 100644 --- a/DeviceSettings/res/values-fr/arrays.xml +++ b/DeviceSettings/res/values-fr/arrays.xml @@ -1,36 +1,36 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string-array name="mdnie_scenario_entries"> - <item>Caméra (Par défaut)</item> - <item>Vidéo</item> - <item>Vidéo (chaud)</item> - <item>Video (froid)</item> - <item>UI</item> - <item>Navigation</item> - <item>Gallerie</item> - <item>VT</item> + <string-array name="mdnie_scenario_entries"> + <item>Caméra (Par défaut)</item> + <item>Vidéo</item> + <item>Vidéo (chaud)</item> + <item>Video (froid)</item> + <item>UI</item> + <item>Navigation</item> + <item>Gallerie</item> + <item>VT</item> </string-array> - <string-array name="mdnie_mode_entries"> - <item>Standard (Par défaut)</item> - <item>Dynamique</item> - <item>Naturel</item> - <item>Vidéo</item> + <string-array name="mdnie_mode_entries"> + <item>Standard (Par défaut)</item> + <item>Dynamique</item> + <item>Naturel</item> + <item>Vidéo</item> </string-array> - <string-array name="mdnie_negative_entries"> - <item>Normal</item> - <item>Inversé</item> + <string-array name="mdnie_negative_entries"> + <item>Normal</item> + <item>Inversé</item> </string-array> - <string-array name="mdnie_outdoor_entries"> - <item>Inactif (Par défaut)</item> - <item>Actif</item> + <string-array name="mdnie_outdoor_entries"> + <item>Inactif (Par défaut)</item> + <item>Actif</item> </string-array> <string-array name="panel_gamma_entries"> - <item>2.2 (Par défaut)</item> - <item>1.9</item> + <item>2.2 (Par défaut)</item> + <item>1.9</item> </string-array> <string-array name="touchscreen_sensitivity_entries"> @@ -43,9 +43,9 @@ </string-array> <string-array name="hspa_entries"> - <item>UMTS seulement</item> - <item>HSDPA seulement</item> - <item>HSDPA + HSUPA</item> + <item>UMTS seulement</item> + <item>HSDPA seulement</item> + <item>HSDPA + HSUPA</item> </string-array> </resources> diff --git a/DeviceSettings/res/values-fr/strings.xml b/DeviceSettings/res/values-fr/strings.xml index c11f8cf..ab81716 100644 --- a/DeviceSettings/res/values-fr/strings.xml +++ b/DeviceSettings/res/values-fr/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Paramètres GalaxyNote</string> + <string name="app_name">Paramètres Galaxy Note</string> <string name="category_mdnie_title">Ecran</string> <string name="screen_colors_title">Couleurs</string> diff --git a/DeviceSettings/res/values-hu/arrays.xml b/DeviceSettings/res/values-hu/arrays.xml index ab52e04..ee1f831 100644 --- a/DeviceSettings/res/values-hu/arrays.xml +++ b/DeviceSettings/res/values-hu/arrays.xml @@ -1,51 +1,51 @@ <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>Videó</item> - <item>Videó (Meleg árnyalat)</item> - <item>Videó (Hideg árnyalat)</item> - <item>Felhasználói felület</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>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="hspa_entries"> - <item>UMTS</item> - <item>HSDPA</item> - <item>HSDPA + HSUPA</item> - </string-array> + <string-array name="mdnie_scenario_entries"> + <item>Kamera (Alapbeállítás)</item> + <item>Videó</item> + <item>Videó (Meleg árnyalat)</item> + <item>Videó (Hideg árnyalat)</item> + <item>Felhasználói felület</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>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="hspa_entries"> + <item>UMTS</item> + <item>HSDPA</item> + <item>HSDPA + HSUPA</item> + </string-array> </resources> diff --git a/DeviceSettings/res/values-hu/strings.xml b/DeviceSettings/res/values-hu/strings.xml index 54197e0..6a24926 100644 --- a/DeviceSettings/res/values-hu/strings.xml +++ b/DeviceSettings/res/values-hu/strings.xml @@ -17,18 +17,23 @@ <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">Állítsd be az érintőképernyő érzékenységét</string> + <string name="touchscreen_sensitivity_summary_head">Érintőképernyő érzékenységének beállítása</string> <string name="category_sensors_title">Szenzorok</string> <string name="gyro_subcat_title">Giroszkóp</string> - <string name="use_gyro_calibration_title_head">Használd a kalibrálási értékeket</string> - <string name="use_gyro_calibration_summary_head">Használd a kalibrálási értékeket. Készíts kalibrációt ha ezt bepipálod!</string> + <string name="use_gyro_calibration_title_head">Kalibrálási érték használata</string> + <string name="use_gyro_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_gyro_title_head">Kalibrálás</string> - <string name="calibrate_gyro_summary_head">Tedd a telefont egy vízszintes felületre, és nyomd meg ezt a gombot a kalibráláshoz</string> + <string name="calibrate_gyro_summary_head">Kalibráláshoz a telefont vízszintes felületre kell helyezni, és megérinteni ezt a gombot</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="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> diff --git a/DeviceSettings/res/values-nl/arrays.xml b/DeviceSettings/res/values-nl/arrays.xml new file mode 100644 index 0000000..ab28dc7 --- /dev/null +++ b/DeviceSettings/res/values-nl/arrays.xml @@ -0,0 +1,50 @@ +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="mdnie_scenario_entries"> + <item>Camera (standaard)</item> + <item>Video</item> + <item>Video (warm)</item> + <item>Video (koud)</item> + <item>Uiterlijk</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>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 & HSUPA</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..587b923 --- /dev/null +++ b/DeviceSettings/res/values-nl/strings.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="app_name">Galaxy Note-instellingen</string> + + <string name="screen_colors_title">Kleuren</string> + <string name="category_mdnie_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="category_sensors_title">Sensoren</string> + <string name="gyro_subcat_title">Gyroscoop</string> + <string name="use_gyro_calibration_title_head">Kalibratiegegevens gebruiken</string> + <string name="use_gyro_calibration_summary_head">Gebruik de kalibratiewaarden van de gyroscoop. Gelieve hierna een kalibratie te doen.</string> + <string name="calibrate_gyro_title_head">Kalibreren</string> + <string name="calibrate_gyro_summary_head">Plaats de telefoon op een vlakke ondergrond en tik hier om te kalibreren</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="category_haptic_title">Haptisch</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> +</resources> diff --git a/DeviceSettings/res/values-pt-rBR/arrays.xml b/DeviceSettings/res/values-pt-rBR/arrays.xml index 75c3ac5..f51ffde 100755 --- a/DeviceSettings/res/values-pt-rBR/arrays.xml +++ b/DeviceSettings/res/values-pt-rBR/arrays.xml @@ -1,51 +1,67 @@ -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
- <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_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="hspa_entries">
- <item>Somente UMTS</item>
- <item>Somente HSDPA</item>
- <item>HSDPA + HSUPA</item>
- </string-array>
-
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <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_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="hspa_entries"> + <item>Somente UMTS</item> + <item>Somente HSDPA</item> + <item>HSDPA + HSUPA</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="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>
\ No newline at end of file diff --git a/DeviceSettings/res/values-pt-rBR/strings.xml b/DeviceSettings/res/values-pt-rBR/strings.xml index 5208649..ba94306 100755 --- a/DeviceSettings/res/values-pt-rBR/strings.xml +++ b/DeviceSettings/res/values-pt-rBR/strings.xml @@ -8,18 +8,18 @@ <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">Ativar/Desativar cores invertidas</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">Ativar/Desativar 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">Definir a sensitividade do toque na tela</string> + <string name="touchscreen_sensitivity_summary_head">Define a sensitividade do toque na tela</string> <string name="category_sensors_title">Sensores</string> <string name="gyro_subcat_title">Giroscópio</string> <string name="use_gyro_calibration_title_head">Usar dados de calibração</string> - <string name="use_gyro_calibration_summary_head">Usar os valores de calibração do giroscópio. Fazer uma calibragem depois de selecionar isto!</string> + <string name="use_gyro_calibration_summary_head">Usa os valores de calibração do giroscópio. Calibre depois de selecionar isto!</string> <string name="calibrate_gyro_title_head">Calibrar</string> <string name="calibrate_gyro_summary_head">Coloque seu telefone em uma superfície plana, e pressione isto para calibrar</string> <string name="touchkey_subcat_title">Tecla sensível ao toque</string> @@ -27,9 +27,11 @@ <string name="touchkey_light_summary_head">Acende as teclas sensíveis ao toque quando a tela estiver ligada</string> <string name="category_radio_title">Rádio</string> <string name="hspa_title_head">HSPA</string> - <string name="hspa_summary_head">Ativar HSDPA/HSUPA</string> + <string name="hspa_summary_head">Ativa HSDPA/HSUPA</string> <string name="category_haptic_title">Resposta Tátil</string> <string name="vibrator_subcat_title">Vibração</string> - <string name="vibrator_intensity_title_head">Intesidade da 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="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> </resources>
\ No newline at end of file diff --git a/DeviceSettings/res/values/arrays.xml b/DeviceSettings/res/values/arrays.xml index e75ee6e..4ee28de 100644 --- a/DeviceSettings/res/values/arrays.xml +++ b/DeviceSettings/res/values/arrays.xml @@ -1,59 +1,59 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="mdnie_scenario_entries"> - <item>Camera (Default)</item> - <item>Video</item> - <item>Video Warm</item> - <item>Video Cold</item> - <item>UI</item> - <item>Navigation</item> - <item>Gallery</item> + <item>Camera (Default)</item> + <item>Video</item> + <item>Video Warm</item> + <item>Video Cold</item> + <item>UI</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>1</item> - <item>2</item> - <item>3</item> - <item>0</item> - <item>5</item> - <item>6</item> + <item>4</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>0</item> + <item>5</item> + <item>6</item> <item>7</item> </string-array> <string-array name="mdnie_mode_entries"> - <item>Standard (Default)</item> - <item>Dynamic</item> + <item>Standard (Default)</item> + <item>Dynamic</item> <item>Natural</item> - <item>Movie</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>0</item> <item>2</item> - <item>3</item> + <item>3</item> </string-array> <string-array name="mdnie_negative_entries"> - <item>Normal</item> - <item>Inverted</item> + <item>Normal</item> + <item>Inverted</item> </string-array> <string-array name="mdnie_negative_entries_values" translatable="false"> <item>0</item> - <item>1</item> + <item>1</item> </string-array> <string-array name="mdnie_outdoor_entries"> - <item>Off (Default)</item> - <item>On</item> + <item>Off (Default)</item> + <item>On</item> </string-array> <string-array name="mdnie_outdoor_entries_values" translatable="false"> - <item>0</item> - <item>1</item> + <item>0</item> + <item>1</item> </string-array> <string-array name="panel_gamma_entries"> @@ -101,15 +101,35 @@ </string-array> <string-array name="hspa_entries"> - <item>UMTS Only</item> - <item>HSDPA Only</item> - <item>HSDPA + HSUPA</item> + <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>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 index 5c38440..be525f1 100644 --- a/DeviceSettings/res/values/strings.xml +++ b/DeviceSettings/res/values/strings.xml @@ -28,6 +28,8 @@ <string name="touchkey_subcat_title">Touch key</string> <string name="touchkey_light_title_head">Enable keys backlight</string> <string name="touchkey_light_summary_head">Light up touch keys 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_haptic_title">Haptic</string> <string name="vibrator_subcat_title">Vibrator</string> diff --git a/DeviceSettings/res/xml/sensors_preferences.xml b/DeviceSettings/res/xml/sensors_preferences.xml index 9029a62..497587d 100644 --- a/DeviceSettings/res/xml/sensors_preferences.xml +++ b/DeviceSettings/res/xml/sensors_preferences.xml @@ -24,6 +24,15 @@ 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/src/com/cyanogenmod/settings/device/DeviceSettings.java b/DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java index 58003a2..a60d9e8 100644 --- a/DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java +++ b/DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java @@ -45,6 +45,7 @@ public class DeviceSettings extends FragmentActivity { public static final String KEY_CALIBRATE_GYRO = "calibrate_gyro"; 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"; ViewPager mViewPager; diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java b/DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java index 015dd7b..bbe5f08 100644 --- a/DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java +++ b/DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java @@ -36,8 +36,8 @@ public class SensorsFragmentActivity extends PreferenceFragment { private static final String TAG = "GalaxyNoteParts_General"; private static final String FILE_USE_GYRO_CALIB = "/sys/class/sec/gsensorcal/calibration"; - private static final String FILE_TOUCHKEY_LIGHT = "/data/.disable_touchlight"; - private static final String FILE_TOUCHKEY_TOGGLE = "/sys/class/sec/sec_touchkey/brightness"; + 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"; @Override public void onCreate(Bundle savedInstanceState) { @@ -47,6 +47,12 @@ public class SensorsFragmentActivity extends PreferenceFragment { PreferenceScreen prefSet = getPreferenceScreen(); + 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 @@ -67,8 +73,15 @@ public class SensorsFragmentActivity extends PreferenceFragment { Utils.writeValue(FILE_USE_GYRO_CALIB, "1"); Utils.showDialog((Context)getActivity(), "Calibration done", "The gyroscope has been successfully calibrated!"); } else if (key.compareTo(DeviceSettings.KEY_TOUCHKEY_LIGHT) == 0) { - Utils.writeValue(FILE_TOUCHKEY_LIGHT, ((CheckBoxPreference)preference).isChecked() ? "1" : "0"); - Utils.writeValue(FILE_TOUCHKEY_TOGGLE, ((CheckBoxPreference)preference).isChecked() ? "1" : "2"); + 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; @@ -80,14 +93,17 @@ public class SensorsFragmentActivity extends PreferenceFragment { public static void restore(Context context) { SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); - String gyroCalib = sharedPrefs.getString(DeviceSettings.KEY_USE_GYRO_CALIBRATION, "1"); + boolean gyroCalib = sharedPrefs.getBoolean(DeviceSettings.KEY_USE_GYRO_CALIBRATION, true); // When use gyro 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 (gyroCalib.compareTo("1") != 0) - Utils.writeValue(FILE_USE_GYRO_CALIB, gyroCalib); + if (!gyroCalib) + Utils.writeValue(FILE_USE_GYRO_CALIB, "0"); + + boolean light = sharedPrefs.getBoolean(DeviceSettings.KEY_TOUCHKEY_LIGHT, true); - Utils.writeValue(FILE_TOUCHKEY_LIGHT, sharedPrefs.getString(DeviceSettings.KEY_TOUCHKEY_LIGHT, "1")); + Utils.writeValue(FILE_TOUCHKEY_BRIGHTNESS, light ? "1" : "0"); + Utils.writeValue(FILE_TOUCHKEY_DISABLE, light ? "0" : "1"); } } diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/Startup.java b/DeviceSettings/src/com/cyanogenmod/settings/device/Startup.java index 7566273..cb3624a 100644 --- a/DeviceSettings/src/com/cyanogenmod/settings/device/Startup.java +++ b/DeviceSettings/src/com/cyanogenmod/settings/device/Startup.java @@ -31,6 +31,8 @@ public class Startup extends BroadcastReceiver { RadioFragmentActivity.restore(context); HapticFragmentActivity.restore(context); VibratorIntensity.restore(context); + SensorsFragmentActivity.restore(context); + TouchkeyTimeout.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..ce741f8 --- /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/led_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/Utils.java b/DeviceSettings/src/com/cyanogenmod/settings/device/Utils.java index 9d4176c..237ea0f 100644 --- a/DeviceSettings/src/com/cyanogenmod/settings/device/Utils.java +++ b/DeviceSettings/src/com/cyanogenmod/settings/device/Utils.java @@ -16,32 +16,96 @@ 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 = "GalaxyNoteSettings_Utils"; + private static final String TAG_READ = "GalaxyNoteSettings_Utils_Read"; + private static final String TAG_WRITE = "GalaxyNoteSettings_Utils_Write"; + /** * Write a string value to the specified file. - * @param filename The filename - * @param value The value + * + * @param filename The filename + * @param value The value */ public static void writeValue(String filename, String value) { + FileOutputStream fos = null; try { - FileOutputStream fos = new FileOutputStream(new File(filename)); + fos = new FileOutputStream(new File(filename), false); fos.write(value.getBytes()); fos.flush(); - fos.getFD().sync(); - fos.close(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); + // 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); + } + } } } |