diff options
Diffstat (limited to 'DeviceSettings/res')
22 files changed, 202 insertions, 193 deletions
diff --git a/DeviceSettings/res/layout/preference_dialog_vibrator_tuning.xml b/DeviceSettings/res/layout/preference_dialog_vibrator_tuning.xml new file mode 100644 index 0000000..1cf116b --- /dev/null +++ b/DeviceSettings/res/layout/preference_dialog_vibrator_tuning.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 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. +--> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center_horizontal" + android:paddingBottom="20dip"> + + <TextView android:id="@+id/vibrator_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/vibrator_tuning_title" + android:paddingTop="10dip" + android:paddingLeft="20dip" + android:paddingRight="20dip" /> + <TextView android:id="@+id/vibrator_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:paddingTop="10dip" + android:paddingLeft="20dip" + android:paddingRight="20dip" /> + <SeekBar android:id="@+id/vibrator_seekbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/vibrator_text" + android:paddingTop="2dip" + android:paddingLeft="20dip" + android:paddingRight="20dip" /> + + <TextView + android:id="@+id/textWarn" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/vibrator_seekbar" + android:paddingTop="8dip" + android:gravity="center" + android:text="@string/vibrator_warning" + android:textSize="15dp" /> + + </RelativeLayout> +</ScrollView> diff --git a/DeviceSettings/res/values-de/arrays.xml b/DeviceSettings/res/values-de/arrays.xml index 9edf346..04b2538 100644 --- a/DeviceSettings/res/values-de/arrays.xml +++ b/DeviceSettings/res/values-de/arrays.xml @@ -1,19 +1,5 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string-array name="vibrator_intensity_entries"> - <item>0%</item> - <item>25%</item> - <item>50% (Standard)</item> - <item>75%</item> - <item>100%</item> - </string-array> - - <string-array name="hspa_entries"> - <item>Nur UMTS</item> - <item>Nur HSDPA</item> - <item>HSDPA + HSUPA</item> - </string-array> - <string-array name="mdnie_scenario_entries"> <item>CyanogenMod (Standard)</item> <item>UI</item> @@ -53,4 +39,10 @@ <item>6 Sekunden</item> </string-array> + <string-array name="hspa_entries"> + <item>Nur UMTS</item> + <item>Nur HSDPA</item> + <item>HSDPA + HSUPA</item> + </string-array> + </resources> diff --git a/DeviceSettings/res/values-de/strings.xml b/DeviceSettings/res/values-de/strings.xml index 099267d..65ce91e 100644 --- a/DeviceSettings/res/values-de/strings.xml +++ b/DeviceSettings/res/values-de/strings.xml @@ -1,23 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Galaxy S III Einstellungen</string> + <string name="app_name">Erweiterte Einstellungen</string> - <string name="category_dock_title">Dock</string> - <string name="dockaudio_subcat_title">Audio</string> - <string name="use_dock_audio_title_head">USB-Dock Audio</string> - <string name="use_dock_audio_summary_head">Passive Audio-Ausgabe des USB-Docks verwenden</string> - - <string name="category_haptic_title">Haptik</string> - <string name="vibrator_subcat_title">Vibrator</string> - <string name="vibrator_intensity_title_head">Vibrator Intensität</string> - <string name="vibrator_intensity_summary_head">Wähle Vibrator Intensität</string> - - <string name="category_radio_title">Mobilfunk</string> - <string name="hspa_title_head">HSPA</string> - <string name="hspa_summary_head">Aktiviere HSDPA/HSUPA</string> + <string name="defaults_button">Zurücksetzen</string> <string name="category_screen_title">Display</string> - <string name="mdnie_subcat_title">Farben</string> + <string name="screen_colors_title">Farben</string> <string name="mdnie_scenario_title_head">Szenario</string> <string name="mdnie_scenario_summary_head">Wähle das mDNIe Szenario</string> <string name="mdnie_mode_title_head">Modus</string> @@ -36,4 +24,21 @@ <string name="touchkey_timeout_title_head">Zeitabschaltung der Beleuchtung</string> <string name="touchkey_timeout_summary_head">Setze Zeit für automatische Abschaltung</string> + <!-- Haptic Preference --> + <string name="category_haptic_title">Haptik</string> + + <!-- VibratorTuning --> + <string name="vibrator_title">Vibrator</string> + <string name="vibrator_tuning_title">Vibrationsstärke</string> + <string name="vibrator_tuning_summary_head">Stärke des Vibrationseffektes einstellen</string> + <string name="vibrator_warning">Vorsicht: Höhere Werte als %1$d werden nicht empfohlen</string> + + <string name="category_radio_title">Mobilfunk</string> + <string name="hspa_title_head">HSPA</string> + <string name="hspa_summary_head">Aktiviere HSDPA/HSUPA</string> + + <string name="category_dock_title">Dock</string> + <string name="dockaudio_subcat_title">Audio</string> + <string name="use_dock_audio_title_head">USB-Dock Audio</string> + <string name="use_dock_audio_summary_head">Passive Audio-Ausgabe des USB-Docks verwenden</string> </resources> diff --git a/DeviceSettings/res/values-es/arrays.xml b/DeviceSettings/res/values-es/arrays.xml index 44666bb..c7d02c5 100644 --- a/DeviceSettings/res/values-es/arrays.xml +++ b/DeviceSettings/res/values-es/arrays.xml @@ -1,11 +1,4 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string-array name="vibrator_intensity_entries"> - <item>0%</item> - <item>25%</item> - <item>50% (por defecto)</item> - <item>75%</item> - <item>100%</item> - </string-array> <string-array name="hspa_entries"> <item>Sólo UMTS</item> <item>Sólo HSDPA</item> diff --git a/DeviceSettings/res/values-es/strings.xml b/DeviceSettings/res/values-es/strings.xml index b0edbc9..f615d4b 100644 --- a/DeviceSettings/res/values-es/strings.xml +++ b/DeviceSettings/res/values-es/strings.xml @@ -6,14 +6,15 @@ <string name="use_dock_audio_title_head">Usar sonido USB</string> <string name="use_dock_audio_summary_head">Utilizar la salida de audio de la base</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 vibración</string> + <string name="vibrator_title">Vibración</string> + <string name="vibrator_tuning_title">Intensidad de vibración</string> + <string name="vibrator_tuning_summary_head">Establecer la intensidad de vibración</string> + <string name="vibrator_warning">No son recomendables valores mayores de %1$d</string> <string name="category_radio_title">Radio</string> <string name="hspa_title_head">HSPA</string> <string name="hspa_summary_head">Habilitar HSDPA/HSUPA</string> <string name="category_screen_title">Pantalla</string> - <string name="mdnie_subcat_title">Colores</string> + <string name="screen_colors_title">Colores</string> <string name="mdnie_scenario_title_head">Escenario</string> <string name="mdnie_scenario_summary_head">Establecer escenario mDNIe</string> <string name="mdnie_mode_title_head">Modo</string> diff --git a/DeviceSettings/res/values-fr/arrays.xml b/DeviceSettings/res/values-fr/arrays.xml index 7b49bf5..11b706d 100644 --- a/DeviceSettings/res/values-fr/arrays.xml +++ b/DeviceSettings/res/values-fr/arrays.xml @@ -14,13 +14,6 @@ limitations under the License. --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string-array name="vibrator_intensity_entries"> - <item>Désactivé</item> - <item>25%</item> - <item>50% (Défaut)</item> - <item>75%</item> - <item>100%</item> - </string-array> <string-array name="hspa_entries"> <item>UMTS seulement</item> <item>HSDPA seulement</item> diff --git a/DeviceSettings/res/values-fr/strings.xml b/DeviceSettings/res/values-fr/strings.xml index 5f2ee6f..5556d24 100644 --- a/DeviceSettings/res/values-fr/strings.xml +++ b/DeviceSettings/res/values-fr/strings.xml @@ -20,14 +20,15 @@ <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> <string name="category_haptic_title">Haptique</string> - <string name="vibrator_subcat_title">Vibreur</string> - <string name="vibrator_intensity_title_head">Intensité du vibreur</string> - <string name="vibrator_intensity_summary_head">Définir l\'intensité du vibreur</string> + <string name="vibrator_title">Vibreur</string> + <string name="vibrator_tuning_title">Intensité du vibreur</string> + <string name="vibrator_tuning_summary_head">Définir l\'intensité du vibreur</string> + <string name="vibrator_warning">Les valeurs supérieurs à %1$d ne sont pas recommandées</string> <string name="category_radio_title">Radio</string> <string name="hspa_title_head">HSPA</string> <string name="hspa_summary_head">Activer HSDPA/HSUPA</string> <string name="category_screen_title">Écran</string> - <string name="mdnie_subcat_title">Couleurs</string> + <string name="screen_colors_title">Couleurs</string> <string name="mdnie_scenario_title_head">Scénario</string> <string name="mdnie_scenario_summary_head">Définir le scénario mDNIe</string> <string name="mdnie_mode_title_head">Mode</string> diff --git a/DeviceSettings/res/values-hu/arrays.xml b/DeviceSettings/res/values-hu/arrays.xml index 824296d..82074a2 100644 --- a/DeviceSettings/res/values-hu/arrays.xml +++ b/DeviceSettings/res/values-hu/arrays.xml @@ -1,13 +1,5 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <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> diff --git a/DeviceSettings/res/values-hu/strings.xml b/DeviceSettings/res/values-hu/strings.xml index f776dca..f5f1411 100644 --- a/DeviceSettings/res/values-hu/strings.xml +++ b/DeviceSettings/res/values-hu/strings.xml @@ -1,23 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Galaxy S III Beállítások</string> + <string name="app_name">Advanced settings</string> <string name="category_dock_title">Dokkoló</string> <string name="dockaudio_subcat_title">Dokkoló hangszórók</string> <string name="use_dock_audio_title_head">Dokkoló hangszóróinak használata</string> <string name="use_dock_audio_summary_head">Használja a dokkoló passzív hangkimenetét</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> <string name="category_screen_title">Kijelző</string> - <string name="mdnie_subcat_title">Színek</string> + <string name="screen_colors_title">Színek</string> <string name="mdnie_scenario_title_head">Megjelenítés</string> <string name="mdnie_scenario_summary_head">mDNIe megjelenítési beállítások</string> <string name="mdnie_mode_title_head">Üzemmód</string> diff --git a/DeviceSettings/res/values-pl/arrays.xml b/DeviceSettings/res/values-pl/arrays.xml index 268ac03..f9de456 100644 --- a/DeviceSettings/res/values-pl/arrays.xml +++ b/DeviceSettings/res/values-pl/arrays.xml @@ -1,13 +1,5 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string-array name="vibrator_intensity_entries"> - <item>0%</item> - <item>25%</item> - <item>50% (domyślnie)</item> - <item>75%</item> - <item>100%</item> - </string-array> - <string-array name="hspa_entries"> <item>Tylko UMTS</item> <item>Tylko HSDPA</item> diff --git a/DeviceSettings/res/values-pl/strings.xml b/DeviceSettings/res/values-pl/strings.xml index 95c3777..20da92d 100644 --- a/DeviceSettings/res/values-pl/strings.xml +++ b/DeviceSettings/res/values-pl/strings.xml @@ -1,23 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Ustawienia Galaxy S III</string> + <string name="app_name">Advanced settings</string> <string name="category_dock_title">Stacja dokująca</string> <string name="dockaudio_subcat_title">Dźwięk w stacji dokującej</string> <string name="use_dock_audio_title_head">Użyj stacji dokującej</string> <string name="use_dock_audio_summary_head">Użyj pasywnego wyjścia audio w stacji dokującej</string> - <string name="category_haptic_title">Dotyk</string> - <string name="vibrator_subcat_title">Wibracje</string> - <string name="vibrator_intensity_title_head">Intensywność wibracji</string> - <string name="vibrator_intensity_summary_head">Ustaw intensywność wibracji</string> - <string name="category_radio_title">Radio</string> <string name="hspa_title_head">HSPA</string> <string name="hspa_summary_head">Aktywuj HSDPA/HSUPA</string> <string name="category_screen_title">Ekran</string> - <string name="mdnie_subcat_title">Kolory</string> + <string name="screen_colors_title">Kolory</string> <string name="mdnie_scenario_title_head">Technologia mDNIe</string> <string name="mdnie_scenario_summary_head">Ustaw scenariusz mDNIe</string> <string name="mdnie_mode_title_head">Tryb</string> diff --git a/DeviceSettings/res/values-pt-rBR/arrays.xml b/DeviceSettings/res/values-pt-rBR/arrays.xml index 7ade7ea..983e35a 100644 --- a/DeviceSettings/res/values-pt-rBR/arrays.xml +++ b/DeviceSettings/res/values-pt-rBR/arrays.xml @@ -1,12 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <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="hspa_entries"> <item>Somente UMTS</item> diff --git a/DeviceSettings/res/values-pt-rBR/strings.xml b/DeviceSettings/res/values-pt-rBR/strings.xml index 7d99c58..5813d7e 100644 --- a/DeviceSettings/res/values-pt-rBR/strings.xml +++ b/DeviceSettings/res/values-pt-rBR/strings.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Configurações avançadas</string> - <string name="category_haptic_title">Resposta Tátil</string> - <string name="vibrator_subcat_title">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="category_haptic_title">Resposta tátil</string> + <string name="vibrator_title">Vibração</string> + <string name="vibrator_tuning_title">Intensidade da vibração</string> + <string name="vibrator_tuning_summary_head">Ajusar a intensidade da resposta por vibração</string> + <string name="vibrator_warning">Valores maiores que %1$d não são recomendados</string> <string name="category_radio_title">Rádio</string> <string name="hspa_summary_head">Ativar HSDPA/HSUPA</string> <string name="category_screen_title">Tela</string> - <string name="mdnie_subcat_title">Cores</string> + <string name="screen_colors_title">Cores</string> <string name="mdnie_scenario_title_head">Cenário</string> <string name="mdnie_scenario_summary_head">Define o Cenário mDNIe</string> <string name="mdnie_mode_title_head">Modo</string> diff --git a/DeviceSettings/res/values-ru/arrays.xml b/DeviceSettings/res/values-ru/arrays.xml index ed61b6e..a83b7b4 100644 --- a/DeviceSettings/res/values-ru/arrays.xml +++ b/DeviceSettings/res/values-ru/arrays.xml @@ -1,13 +1,5 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string-array name="vibrator_intensity_entries"> - <item>0%</item> - <item>25%</item> - <item>50% (По умолч.)</item> - <item>75%</item> - <item>100%</item> - </string-array> - <string-array name="hspa_entries"> <item>Только UMTS</item> <item>Только HSDPA</item> diff --git a/DeviceSettings/res/values-ru/strings.xml b/DeviceSettings/res/values-ru/strings.xml index 47fe8ff..c7b287a 100644 --- a/DeviceSettings/res/values-ru/strings.xml +++ b/DeviceSettings/res/values-ru/strings.xml @@ -1,23 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Настройки Galaxy S III</string> - - <string name="category_dock_title">Док-станция</string> - <string name="dockaudio_subcat_title">Аудио</string> - <string name="use_dock_audio_title_head">USB аудио док-станция</string> - <string name="use_dock_audio_summary_head">Использовать пассивный режим аудио док-станции</string> - - <string name="category_haptic_title">Отклик</string> - <string name="vibrator_subcat_title">Вибрация</string> - <string name="vibrator_intensity_title_head">Интенсивность вибрации</string> - <string name="vibrator_intensity_summary_head">Установка интенсивности вибрации</string> - - <string name="category_radio_title">Модем</string> - <string name="hspa_title_head">HSPA</string> - <string name="hspa_summary_head">Включить HSDPA/HSUPA</string> + <string name="app_name">Advanced settings</string> <string name="category_screen_title">Экран</string> - <string name="mdnie_subcat_title">Цвета</string> + <string name="screen_colors_title">Цвета</string> <string name="mdnie_scenario_title_head">Сценарий</string> <string name="mdnie_scenario_summary_head">Установка сценария mDNIe</string> <string name="mdnie_mode_title_head">Режим</string> @@ -36,4 +22,21 @@ <string name="touchkey_timeout_title_head">Тайм-аут подсветки</string> <string name="touchkey_timeout_summary_head">Установка тайм-аута подсветки</string> + <!-- Haptic Preference --> + <string name="category_haptic_title">Отклик</string> + + <!-- VibratorTuning --> + <string name="vibrator_title">Вибрация</string> + <string name="vibrator_tuning_title">Интенсивность вибрации</string> + <string name="vibrator_tuning_summary_head">Установка интенсивности вибрации</string> + <string name="vibrator_warning">Не рекомендуется установка значения выше %1$d</string> + + <string name="category_radio_title">Модем</string> + <string name="hspa_title_head">HSPA</string> + <string name="hspa_summary_head">Включить HSDPA/HSUPA</string> + + <string name="category_dock_title">Док-станция</string> + <string name="dockaudio_subcat_title">Аудио</string> + <string name="use_dock_audio_title_head">USB аудио док-станция</string> + <string name="use_dock_audio_summary_head">Использовать пассивный режим аудио док-станции</string> </resources> diff --git a/DeviceSettings/res/values-zh-rCN/arrays.xml b/DeviceSettings/res/values-zh-rCN/arrays.xml index 6afb949..373d649 100644 --- a/DeviceSettings/res/values-zh-rCN/arrays.xml +++ b/DeviceSettings/res/values-zh-rCN/arrays.xml @@ -15,13 +15,6 @@ --> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string-array name="vibrator_intensity_entries"> - <item>0%</item> - <item>25%</item> - <item>50% (默认)</item> - <item>75%</item> - <item>100%</item> - </string-array> <string-array name="hspa_entries"> <item>仅使用 UMTS</item> diff --git a/DeviceSettings/res/values-zh-rCN/strings.xml b/DeviceSettings/res/values-zh-rCN/strings.xml index b0cc29a..f4158b9 100644 --- a/DeviceSettings/res/values-zh-rCN/strings.xml +++ b/DeviceSettings/res/values-zh-rCN/strings.xml @@ -17,17 +17,12 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_name">高级设置</string> - <string name="category_haptic_title">振动</string> - <string name="vibrator_subcat_title">振动器</string> - <string name="vibrator_intensity_title_head">振动器强度</string> - <string name="vibrator_intensity_summary_head">设置振动器强度</string> - <string name="category_radio_title">无线电</string> <string name="hspa_title_head">HSPA</string> <string name="hspa_summary_head">启用 HSDPA/HSUPA</string> <string name="category_screen_title">屏幕</string> - <string name="mdnie_subcat_title">颜色</string> + <string name="screen_colors_title">颜色</string> <string name="mdnie_scenario_title_head">场景</string> <string name="mdnie_scenario_summary_head">设置 mDNIe 场景</string> <string name="mdnie_mode_title_head">模式</string> diff --git a/DeviceSettings/res/values/arrays.xml b/DeviceSettings/res/values/arrays.xml index d82ffbc..8e99c95 100644 --- a/DeviceSettings/res/values/arrays.xml +++ b/DeviceSettings/res/values/arrays.xml @@ -1,33 +1,5 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string-array name="vibrator_intensity_entries"> - <item>0%</item> - <item>25%</item> - <item>50% (Default)</item> - <item>75%</item> - <item>100%</item> - </string-array> - - <string-array name="vibrator_intensity_entries_values" translatable="false"> - <item>0</item> - <item>25</item> - <item>50</item> - <item>75</item> - <item>100</item> - </string-array> - - <string-array name="hspa_entries"> - <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>22</item> - <item>23</item> - </string-array> - <string-array name="mdnie_scenario_entries"> <item>CyanogenMod (Default)</item> <item>UI</item> @@ -76,16 +48,6 @@ <item>1</item> </string-array> - <string-array name="led_fade_entries"> - <item>Blinking</item> - <item>Fading</item> - </string-array> - - <string-array name="led_fade_entries_values" translatable="false"> - <item>0</item> - <item>1</item> - </string-array> - <string-array name="touchkey_timeout_entries"> <item>Never</item> <item>1 second</item> @@ -106,4 +68,26 @@ <item>6</item> </string-array> + <string-array name="led_fade_entries"> + <item>Blinking</item> + <item>Fading</item> + </string-array> + + <string-array name="led_fade_entries_values" translatable="false"> + <item>0</item> + <item>1</item> + </string-array> + + <string-array name="hspa_entries"> + <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>22</item> + <item>23</item> + </string-array> + </resources> diff --git a/DeviceSettings/res/values/config.xml b/DeviceSettings/res/values/config.xml new file mode 100644 index 0000000..5667f97 --- /dev/null +++ b/DeviceSettings/res/values/config.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 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. +--> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- Vibrator Tuning --> + <bool name="has_vibrator_tuning">true</bool> + <string name="vibrator_sysfs_file">"/sys/vibrator/pwm_val"</string> + <string name="intensity_max_value">100</string> + <string name="intensity_warning_threshold">75</string> + <string name="intensity_default_value">50</string> + <string name="intensity_min_value">0</string> + +</resources> diff --git a/DeviceSettings/res/values/strings.xml b/DeviceSettings/res/values/strings.xml index 1bf9807..155e9c2 100644 --- a/DeviceSettings/res/values/strings.xml +++ b/DeviceSettings/res/values/strings.xml @@ -2,11 +2,13 @@ <resources> <string name="app_name">Advanced settings</string> - <!-- Screen --> + <string name="defaults_button">Reset to default</string> + + <!-- Screen Preference --> <string name="category_screen_title">Screen</string> - <string name="mdnie_subcat_title">Colors</string> + <string name="screen_colors_title">Colors</string> - <!-- CABC --> + <!-- Content adaptive backlight control --> <string name="cabc_title_head">CABC</string> <string name="cabc_summary_head">Enable content adaptive backlight control</string> @@ -23,7 +25,7 @@ <string name="led_fade_title_head">LED Fading</string> <string name="led_fade_summary_head">Enable LED smooth fading instead of sharp blinking.</string> - <!-- Touchkey --> + <!-- Touchkey tuning --> <string name="touchkey_subcat_title">Touchkeys</string> <string name="touchkey_light_title_head">Backlight</string> <string name="touchkey_light_summary_off">Enable backlight</string> @@ -31,21 +33,24 @@ <string name="touchkey_timeout_title_head">Backlight timeout</string> <string name="touchkey_timeout_summary_head">Set timeout for the backlight</string> - <!-- Dock --> - <string name="category_dock_title">Dock</string> - <string name="dockaudio_subcat_title">Dock Audio</string> - <string name="use_dock_audio_title_head">Use Dock USB Audio</string> - <string name="use_dock_audio_summary_head">Use the passive audio out on the dock</string> - - <!-- Haptic --> + <!-- Haptic Preference --> <string name="category_haptic_title">Haptic</string> - <string name="vibrator_subcat_title">Vibrator</string> - <string name="vibrator_intensity_title_head">Vibrator Intensity</string> - <string name="vibrator_intensity_summary_head">Set vibrator intensity</string> - <!-- Radio --> + <!-- VibratorTuning --> + <string name="vibrator_title">Vibrator</string> + <string name="vibrator_tuning_title">Vibration strength</string> + <string name="vibrator_tuning_summary_head">Adjust the strength of the vibration feedback</string> + <string name="vibrator_warning">Values higher than %1$d are not recommended</string> + + <!-- Radio Preference --> <string name="category_radio_title">Radio</string> <string name="hspa_title_head">HSPA</string> <string name="hspa_summary_head">Enable HSDPA/HSUPA</string> + <!-- Dock Preference --> + <string name="category_dock_title">Dock</string> + <string name="dockaudio_subcat_title">Audio</string> + <string name="use_dock_audio_title_head">Use Dock USB Audio</string> + <string name="use_dock_audio_summary_head">Use the passive audio out on the dock</string> + </resources> diff --git a/DeviceSettings/res/xml/haptic_preferences.xml b/DeviceSettings/res/xml/haptic_preferences.xml index 31c0e21..31070ed 100644 --- a/DeviceSettings/res/xml/haptic_preferences.xml +++ b/DeviceSettings/res/xml/haptic_preferences.xml @@ -1,13 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceCategory - android:title="@string/vibrator_subcat_title"> - <com.cyanogenmod.settings.device.VibratorIntensity - android:key="vibrator_intensity" - android:title="@string/vibrator_intensity_title_head" - android:summary="@string/vibrator_intensity_summary_head" - android:entries="@array/vibrator_intensity_entries" - android:entryValues="@array/vibrator_intensity_entries_values" - android:defaultValue="50" /> + android:title="@string/vibrator_title"> + <com.cyanogenmod.settings.device.VibratorTuningPreference + android:key="vibrator_tuning" + android:title="@string/vibrator_tuning_title" + android:dialogTitle="@string/vibrator_tuning_title" /> </PreferenceCategory> </PreferenceScreen> diff --git a/DeviceSettings/res/xml/screen_preferences.xml b/DeviceSettings/res/xml/screen_preferences.xml index 313f22c..57d1761 100644 --- a/DeviceSettings/res/xml/screen_preferences.xml +++ b/DeviceSettings/res/xml/screen_preferences.xml @@ -3,8 +3,7 @@ <!-- Screen --> <PreferenceCategory - android:title="@string/mdnie_subcat_title"> - + android:title="@string/screen_colors_title"> <!-- CABC --> <com.cyanogenmod.settings.device.CABC android:key="cabc" |