From 98d17e577a0bb91f291e67d8f4465e6987f06b2d Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Sun, 9 Jun 2013 11:47:40 +0200 Subject: i9300: advanced settings: pimp my vibrator Change-Id: I1f53f511c0afcf60a8063935ad9f8e3f05a61137 --- .../layout/preference_dialog_vibrator_tuning.xml | 59 ++++++ DeviceSettings/res/values-de/arrays.xml | 20 +- DeviceSettings/res/values-de/strings.xml | 35 ++-- DeviceSettings/res/values-es/arrays.xml | 7 - DeviceSettings/res/values-es/strings.xml | 9 +- DeviceSettings/res/values-fr/arrays.xml | 7 - DeviceSettings/res/values-fr/strings.xml | 9 +- DeviceSettings/res/values-hu/arrays.xml | 8 - DeviceSettings/res/values-hu/strings.xml | 9 +- DeviceSettings/res/values-pl/arrays.xml | 8 - DeviceSettings/res/values-pl/strings.xml | 9 +- DeviceSettings/res/values-pt-rBR/arrays.xml | 7 - DeviceSettings/res/values-pt-rBR/strings.xml | 11 +- DeviceSettings/res/values-ru/arrays.xml | 8 - DeviceSettings/res/values-ru/strings.xml | 35 ++-- DeviceSettings/res/values-zh-rCN/arrays.xml | 7 - DeviceSettings/res/values-zh-rCN/strings.xml | 7 +- DeviceSettings/res/values/arrays.xml | 60 +++--- DeviceSettings/res/values/config.xml | 29 +++ DeviceSettings/res/values/strings.xml | 35 ++-- DeviceSettings/res/xml/haptic_preferences.xml | 13 +- DeviceSettings/res/xml/screen_preferences.xml | 3 +- .../settings/device/DeviceSettings.java | 5 +- .../settings/device/DockFragmentActivity.java | 3 - .../settings/device/HapticFragmentActivity.java | 20 +- .../settings/device/ScreenFragmentActivity.java | 2 +- .../com/cyanogenmod/settings/device/Startup.java | 2 +- .../src/com/cyanogenmod/settings/device/Utils.java | 22 ++- .../settings/device/VibratorIntensity.java | 59 ------ .../settings/device/VibratorTuningPreference.java | 219 +++++++++++++++++++++ 30 files changed, 459 insertions(+), 268 deletions(-) create mode 100644 DeviceSettings/res/layout/preference_dialog_vibrator_tuning.xml create mode 100644 DeviceSettings/res/values/config.xml delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/VibratorIntensity.java create mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/VibratorTuningPreference.java 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 @@ + + + + + + + + + + + + + + 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 @@ - - 0% - 25% - 50% (Standard) - 75% - 100% - - - - Nur UMTS - Nur HSDPA - HSDPA + HSUPA - - CyanogenMod (Standard) UI @@ -53,4 +39,10 @@ 6 Sekunden + + Nur UMTS + Nur HSDPA + HSDPA + HSUPA + + 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 @@ - Galaxy S III Einstellungen + Erweiterte Einstellungen - Dock - Audio - USB-Dock Audio - Passive Audio-Ausgabe des USB-Docks verwenden - - Haptik - Vibrator - Vibrator Intensität - Wähle Vibrator Intensität - - Mobilfunk - HSPA - Aktiviere HSDPA/HSUPA + Zurücksetzen Display - Farben + Farben Szenario Wähle das mDNIe Szenario Modus @@ -36,4 +24,21 @@ Zeitabschaltung der Beleuchtung Setze Zeit für automatische Abschaltung + + Haptik + + + Vibrator + Vibrationsstärke + Stärke des Vibrationseffektes einstellen + Vorsicht: Höhere Werte als %1$d werden nicht empfohlen + + Mobilfunk + HSPA + Aktiviere HSDPA/HSUPA + + Dock + Audio + USB-Dock Audio + Passive Audio-Ausgabe des USB-Docks verwenden 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 @@ - - 0% - 25% - 50% (por defecto) - 75% - 100% - Sólo UMTS Sólo HSDPA 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 @@ Usar sonido USB Utilizar la salida de audio de la base Háptica - Vibración - Intensidad de vibración - Establecer la intensidad de vibración + Vibración + Intensidad de vibración + Establecer la intensidad de vibración + No son recomendables valores mayores de %1$d Radio HSPA Habilitar HSDPA/HSUPA Pantalla - Colores + Colores Escenario Establecer escenario mDNIe Modo 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. --> - - Désactivé - 25% - 50% (Défaut) - 75% - 100% - UMTS seulement HSDPA seulement 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 @@ Sortie audio Utiliser la sortie audio de la station d\'accueil Haptique - Vibreur - Intensité du vibreur - Définir l\'intensité du vibreur + Vibreur + Intensité du vibreur + Définir l\'intensité du vibreur + Les valeurs supérieurs à %1$d ne sont pas recommandées Radio HSPA Activer HSDPA/HSUPA Écran - Couleurs + Couleurs Scénario Définir le scénario mDNIe Mode 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 @@ - - 0% - 25% - 50% (Alapbeállítás) - 75% - 100% - - UMTS HSDPA 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 @@ - Galaxy S III Beállítások + Advanced settings Dokkoló Dokkoló hangszórók Dokkoló hangszóróinak használata Használja a dokkoló passzív hangkimenetét - Érintési visszajelzés - Rezgés - Rezgés erőssége - Rezgés erősségének beállítása - GSM Rádió HSPA HSDPA/HSUPA engedélyezése Kijelző - Színek + Színek Megjelenítés mDNIe megjelenítési beállítások Üzemmód 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 @@ - - 0% - 25% - 50% (domyślnie) - 75% - 100% - - Tylko UMTS Tylko HSDPA 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 @@ - Ustawienia Galaxy S III + Advanced settings Stacja dokująca Dźwięk w stacji dokującej Użyj stacji dokującej Użyj pasywnego wyjścia audio w stacji dokującej - Dotyk - Wibracje - Intensywność wibracji - Ustaw intensywność wibracji - Radio HSPA Aktywuj HSDPA/HSUPA Ekran - Kolory + Kolory Technologia mDNIe Ustaw scenariusz mDNIe Tryb 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 @@  - - 0% - 25% - 50% (Padrão) - 75% - 100% - Somente UMTS 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 @@ Configurações avançadas - Resposta Tátil - Vibração - Intensidade da Vibração - Define a intensidade da vibração + Resposta tátil + Vibração + Intensidade da vibração + Ajusar a intensidade da resposta por vibração + Valores maiores que %1$d não são recomendados Rádio Ativar HSDPA/HSUPA Tela - Cores + Cores Cenário Define o Cenário mDNIe Modo 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 @@ - - 0% - 25% - 50% (По умолч.) - 75% - 100% - - Только UMTS Только HSDPA 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 @@ - Настройки Galaxy S III - - Док-станция - Аудио - USB аудио док-станция - Использовать пассивный режим аудио док-станции - - Отклик - Вибрация - Интенсивность вибрации - Установка интенсивности вибрации - - Модем - HSPA - Включить HSDPA/HSUPA + Advanced settings Экран - Цвета + Цвета Сценарий Установка сценария mDNIe Режим @@ -36,4 +22,21 @@ Тайм-аут подсветки Установка тайм-аута подсветки + + Отклик + + + Вибрация + Интенсивность вибрации + Установка интенсивности вибрации + Не рекомендуется установка значения выше %1$d + + Модем + HSPA + Включить HSDPA/HSUPA + + Док-станция + Аудио + USB аудио док-станция + Использовать пассивный режим аудио док-станции 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 @@ --> - - 0% - 25% - 50% (默认) - 75% - 100% - 仅使用 UMTS 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"> 高级设置 - 振动 - 振动器 - 振动器强度 - 设置振动器强度 - 无线电 HSPA 启用 HSDPA/HSUPA 屏幕 - 颜色 + 颜色 场景 设置 mDNIe 场景 模式 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 @@ - - 0% - 25% - 50% (Default) - 75% - 100% - - - - 0 - 25 - 50 - 75 - 100 - - - - UMTS Only - HSDPA Only - HSDPA + HSUPA - - - - 21 - 22 - 23 - - CyanogenMod (Default) UI @@ -76,16 +48,6 @@ 1 - - Blinking - Fading - - - - 0 - 1 - - Never 1 second @@ -106,4 +68,26 @@ 6 + + Blinking + Fading + + + + 0 + 1 + + + + UMTS Only + HSDPA Only + HSDPA + HSUPA + + + + 21 + 22 + 23 + + 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 @@ + + + + + + + + true + "/sys/vibrator/pwm_val" + 100 + 75 + 50 + 0 + + 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 @@ Advanced settings - + Reset to default + + Screen - Colors + Colors - + CABC Enable content adaptive backlight control @@ -23,7 +25,7 @@ LED Fading Enable LED smooth fading instead of sharp blinking. - + Touchkeys Backlight Enable backlight @@ -31,21 +33,24 @@ Backlight timeout Set timeout for the backlight - - Dock - Dock Audio - Use Dock USB Audio - Use the passive audio out on the dock - - + Haptic - Vibrator - Vibrator Intensity - Set vibrator intensity - + + Vibrator + Vibration strength + Adjust the strength of the vibration feedback + Values higher than %1$d are not recommended + + Radio HSPA Enable HSDPA/HSUPA + + Dock + Audio + Use Dock USB Audio + Use the passive audio out on the dock + 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 @@ - + android:title="@string/vibrator_title"> + 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 @@ - + android:title="@string/screen_colors_title"> = strengthToPercent(WARNING_THRESHOLD); + if (mProgressDrawable != null) { + mProgressDrawable.setColorFilter(shouldWarn ? mRedFilter : null); + } + if (mProgressThumb != null) { + mProgressThumb.setColorFilter(shouldWarn ? mRedFilter : null); + } + Utils.writeValue(FILE_PATH, String.valueOf(percentToStrength(progress))); + mValue.setText(String.format("%d%%", progress)); + } + + @Override + public void onStartTrackingTouch(SeekBar seekBar) { + // Do nothing + } + + @Override + public void onStopTrackingTouch(SeekBar seekBar) { + Vibrator vib = (Vibrator) getContext().getSystemService(Context.VIBRATOR_SERVICE); + vib.vibrate(200); + } + + /** + * Convert vibrator strength to percent + */ + public static int strengthToPercent(int strength) { + double maxValue = MAX_VALUE; + double minValue = MIN_VALUE; + + double percent = (strength - minValue) * (100 / (maxValue - minValue)); + + if (percent > 100) + percent = 100; + else if (percent < 0) + percent = 0; + + return (int) percent; + } + + /** + * Convert percent to vibrator strength + */ + public static int percentToStrength(int percent) { + int strength = Math.round((((MAX_VALUE - MIN_VALUE) * percent) / 100) + MIN_VALUE); + + if (strength > MAX_VALUE) + strength = MAX_VALUE; + else if (strength < MIN_VALUE) + strength = MIN_VALUE; + + return strength; + } +} -- cgit v1.1