From 5998d47bda5fd4b487ab398f033445cb58e8993b Mon Sep 17 00:00:00 2001 From: Max Weffers Date: Sat, 19 Oct 2019 17:48:57 +0200 Subject: [PATCH] sdm660: parts: Rename Performance Profile to Temperature Profile --- XiaomiParts/AndroidManifest.xml | 4 ++-- XiaomiParts/res/drawable/ic_performance.xml | 9 -------- XiaomiParts/res/drawable/ic_thermal.xml | 8 +++++++ XiaomiParts/res/drawable/spectrum_balance.xml | 12 ---------- XiaomiParts/res/drawable/thermal_balance.xml | 12 ++++++++++ XiaomiParts/res/values-de-rDE/strings.xml | 20 ++++++++--------- XiaomiParts/res/values-es-rES/strings.xml | 22 +++++++++---------- XiaomiParts/res/values-es-rMX/strings.xml | 22 +++++++++---------- XiaomiParts/res/values-es/strings.xml | 22 +++++++++---------- XiaomiParts/res/values-ja-rJP/strings.xml | 22 +++++++++---------- XiaomiParts/res/values-ko-rKR/strings.xml | 22 +++++++++---------- XiaomiParts/res/values-ru-rRU/strings.xml | 22 +++++++++---------- XiaomiParts/res/values-ru/strings.xml | 22 +++++++++---------- XiaomiParts/res/values-sk-rSK/strings.xml | 20 ++++++++--------- XiaomiParts/res/values-zh-rCN/strings.xml | 22 +++++++++---------- XiaomiParts/res/values-zh/strings.xml | 22 +++++++++---------- XiaomiParts/res/values/arrays.xml | 14 ++++++------ XiaomiParts/res/values/strings.xml | 22 +++++++++---------- .../res/xml/preferences_xiaomi_parts.xml | 22 +++++++++---------- .../settings/device/BootReceiver.java | 4 ++-- .../settings/device/DeviceSettings.java | 22 +++++++++---------- .../device/PerformanceTileService.java | 10 ++++----- 22 files changed, 188 insertions(+), 189 deletions(-) delete mode 100644 XiaomiParts/res/drawable/ic_performance.xml create mode 100644 XiaomiParts/res/drawable/ic_thermal.xml delete mode 100644 XiaomiParts/res/drawable/spectrum_balance.xml create mode 100644 XiaomiParts/res/drawable/thermal_balance.xml diff --git a/XiaomiParts/AndroidManifest.xml b/XiaomiParts/AndroidManifest.xml index 0031bdfb..92d04e95 100644 --- a/XiaomiParts/AndroidManifest.xml +++ b/XiaomiParts/AndroidManifest.xml @@ -78,8 +78,8 @@ diff --git a/XiaomiParts/res/drawable/ic_performance.xml b/XiaomiParts/res/drawable/ic_performance.xml deleted file mode 100644 index 8aece7df..00000000 --- a/XiaomiParts/res/drawable/ic_performance.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/XiaomiParts/res/drawable/ic_thermal.xml b/XiaomiParts/res/drawable/ic_thermal.xml new file mode 100644 index 00000000..c8de8b53 --- /dev/null +++ b/XiaomiParts/res/drawable/ic_thermal.xml @@ -0,0 +1,8 @@ + + + diff --git a/XiaomiParts/res/drawable/spectrum_balance.xml b/XiaomiParts/res/drawable/spectrum_balance.xml deleted file mode 100644 index 90560a3f..00000000 --- a/XiaomiParts/res/drawable/spectrum_balance.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/XiaomiParts/res/drawable/thermal_balance.xml b/XiaomiParts/res/drawable/thermal_balance.xml new file mode 100644 index 00000000..e0a5b308 --- /dev/null +++ b/XiaomiParts/res/drawable/thermal_balance.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/XiaomiParts/res/values-de-rDE/strings.xml b/XiaomiParts/res/values-de-rDE/strings.xml index 681a1b20..cbf6c6d3 100644 --- a/XiaomiParts/res/values-de-rDE/strings.xml +++ b/XiaomiParts/res/values-de-rDE/strings.xml @@ -20,17 +20,17 @@ Displaykalibierung Stärke - - Leistung - Leistung Einstellung - Wähle die Leistungstufe - Wähle die Leistungstufe + + Temperatur + Temperatur Einstellung + Wähle das Temperatur Profil + Wähle das Temperatur Profil - Performance - Energieeffizient - Gaming - Balance - Energiesparmodus + Performance + Energieeffizient + Gaming + Balance + Energiesparen Haptisches Feedback diff --git a/XiaomiParts/res/values-es-rES/strings.xml b/XiaomiParts/res/values-es-rES/strings.xml index 2237f5a8..3f5df040 100644 --- a/XiaomiParts/res/values-es-rES/strings.xml +++ b/XiaomiParts/res/values-es-rES/strings.xml @@ -25,18 +25,18 @@ Retroalimentación háptica Fuerza - - Rendimiento - Ajustes de Rendimiento - Elija su configuración de Rendimiento - Elija su configuración de Rendimiento + + Rendimiento + Ajustes de Rendimiento + Elija su configuración de Rendimiento + Elija su configuración de Rendimiento - - Rendimiento - Batería - Juego - Balance - Batería Extrema + + Rendimiento + Batería + Juego + Balance + Batería Extrema diff --git a/XiaomiParts/res/values-es-rMX/strings.xml b/XiaomiParts/res/values-es-rMX/strings.xml index 2237f5a8..3f5df040 100644 --- a/XiaomiParts/res/values-es-rMX/strings.xml +++ b/XiaomiParts/res/values-es-rMX/strings.xml @@ -25,18 +25,18 @@ Retroalimentación háptica Fuerza - - Rendimiento - Ajustes de Rendimiento - Elija su configuración de Rendimiento - Elija su configuración de Rendimiento + + Rendimiento + Ajustes de Rendimiento + Elija su configuración de Rendimiento + Elija su configuración de Rendimiento - - Rendimiento - Batería - Juego - Balance - Batería Extrema + + Rendimiento + Batería + Juego + Balance + Batería Extrema diff --git a/XiaomiParts/res/values-es/strings.xml b/XiaomiParts/res/values-es/strings.xml index 84a34acb..947929e6 100644 --- a/XiaomiParts/res/values-es/strings.xml +++ b/XiaomiParts/res/values-es/strings.xml @@ -25,18 +25,18 @@ Retroalimentación háptica Fuerza - - Rendimiento - Ajustes de Rendimiento - Elija su configuración de Rendimiento - Elija su configuración de Rendimiento + + Rendimiento + Ajustes de Rendimiento + Elija su configuración de Rendimiento + Elija su configuración de Rendimiento - - Rendimiento - Batería - Juego - Balance - Batería Extrema + + Rendimiento + Batería + Juego + Balance + Batería Extrema diff --git a/XiaomiParts/res/values-ja-rJP/strings.xml b/XiaomiParts/res/values-ja-rJP/strings.xml index 6dc51b88..27b72b60 100644 --- a/XiaomiParts/res/values-ja-rJP/strings.xml +++ b/XiaomiParts/res/values-ja-rJP/strings.xml @@ -29,18 +29,18 @@ 振動フィードバック 強さ - - パフォーマンス - パフォーマンスの設定 - パフォーマンス設定を選択して下さい - パフォーマンス設定を選択して下さい + + パフォーマンス + パフォーマンスの設定 + パフォーマンス設定を選択して下さい + パフォーマンス設定を選択して下さい - - 高性能 - 省電力 - ゲーム - バランス - 超省電力 + + 高性能 + 省電力 + ゲーム + バランス + 超省電力 diff --git a/XiaomiParts/res/values-ko-rKR/strings.xml b/XiaomiParts/res/values-ko-rKR/strings.xml index 3fe9b34b..9e87252d 100644 --- a/XiaomiParts/res/values-ko-rKR/strings.xml +++ b/XiaomiParts/res/values-ko-rKR/strings.xml @@ -31,18 +31,18 @@ 햅틱 피드백 세기 - - 성능 - 성능 설정 - 성능 설정 선택 - 성능 설정 선택 + + 성능 + 성능 설정 + 성능 설정 선택 + 성능 설정 선택 - - 성능 향상 - 배터리 향상 - 게이밍 최적화 - 균형 설정 - 배터리 매우 향상 + + 성능 향상 + 배터리 향상 + 게이밍 최적화 + 균형 설정 + 배터리 매우 향상 diff --git a/XiaomiParts/res/values-ru-rRU/strings.xml b/XiaomiParts/res/values-ru-rRU/strings.xml index 3edefe8a..b7f8b3b7 100644 --- a/XiaomiParts/res/values-ru-rRU/strings.xml +++ b/XiaomiParts/res/values-ru-rRU/strings.xml @@ -31,18 +31,18 @@ Вибрация Сила - - Производительность - Настройки производительности - Выберите Ваш профил производительности - Выберите Ваш профил производительности + + Производительность + Настройки производительности + Выберите Ваш профил производительности + Выберите Ваш профил производительности - - Производительность - Энергосбережение - Игры - Баланс - Экстримное энергосбережение + + Производительность + Энергосбережение + Игры + Баланс + Экстримное энергосбережение diff --git a/XiaomiParts/res/values-ru/strings.xml b/XiaomiParts/res/values-ru/strings.xml index 3edefe8a..b7f8b3b7 100644 --- a/XiaomiParts/res/values-ru/strings.xml +++ b/XiaomiParts/res/values-ru/strings.xml @@ -31,18 +31,18 @@ Вибрация Сила - - Производительность - Настройки производительности - Выберите Ваш профил производительности - Выберите Ваш профил производительности + + Производительность + Настройки производительности + Выберите Ваш профил производительности + Выберите Ваш профил производительности - - Производительность - Энергосбережение - Игры - Баланс - Экстримное энергосбережение + + Производительность + Энергосбережение + Игры + Баланс + Экстримное энергосбережение diff --git a/XiaomiParts/res/values-sk-rSK/strings.xml b/XiaomiParts/res/values-sk-rSK/strings.xml index df7b2022..6c40962c 100644 --- a/XiaomiParts/res/values-sk-rSK/strings.xml +++ b/XiaomiParts/res/values-sk-rSK/strings.xml @@ -20,17 +20,17 @@ Kalibrácia farieb Sila vibrácií - - Výkon - Nastavenia výkonu - Výber nastavenia výkonu - Výber nastavenia výkonu + + Výkon + Nastavenia výkonu + Výber nastavenia výkonu + Výber nastavenia výkonu - Výkon - Šetrič batérie - Gaming - Vyvážený - Extrémny šetrič batérie + Výkon + Šetrič batérie + Gaming + Vyvážený + Extrémny šetrič batérie Vibrácie diff --git a/XiaomiParts/res/values-zh-rCN/strings.xml b/XiaomiParts/res/values-zh-rCN/strings.xml index 9e56bda9..5f26398d 100644 --- a/XiaomiParts/res/values-zh-rCN/strings.xml +++ b/XiaomiParts/res/values-zh-rCN/strings.xml @@ -29,18 +29,18 @@ 触觉反馈 强度 - - 性能 - 性能选项 - 性能选项 - 设置性能选项 + + 性能 + 性能选项 + 性能选项 + 设置性能选项 - - 高性能 - 延长电池 - 游戏 - 平衡 - 极致延长电池 + + 高性能 + 延长电池 + 游戏 + 平衡 + 极致延长电池 diff --git a/XiaomiParts/res/values-zh/strings.xml b/XiaomiParts/res/values-zh/strings.xml index 9e56bda9..5f26398d 100644 --- a/XiaomiParts/res/values-zh/strings.xml +++ b/XiaomiParts/res/values-zh/strings.xml @@ -29,18 +29,18 @@ 触觉反馈 强度 - - 性能 - 性能选项 - 性能选项 - 设置性能选项 + + 性能 + 性能选项 + 性能选项 + 设置性能选项 - - 高性能 - 延长电池 - 游戏 - 平衡 - 极致延长电池 + + 高性能 + 延长电池 + 游戏 + 平衡 + 极致延长电池 diff --git a/XiaomiParts/res/values/arrays.xml b/XiaomiParts/res/values/arrays.xml index 5f92fd58..fce1821e 100644 --- a/XiaomiParts/res/values/arrays.xml +++ b/XiaomiParts/res/values/arrays.xml @@ -14,14 +14,14 @@ limitations under the License. --> - - @string/spectrum_balance - @string/spectrum_performance - @string/spectrum_battery - @string/spectrum_gaming - @string/spectrum_extreme_battery + + @string/thermal_balance + @string/thermal_performance + @string/thermal_battery + @string/thermal_gaming + @string/thermal_extreme_battery - + 0 1 2 diff --git a/XiaomiParts/res/values/strings.xml b/XiaomiParts/res/values/strings.xml index 7790276d..d124f275 100644 --- a/XiaomiParts/res/values/strings.xml +++ b/XiaomiParts/res/values/strings.xml @@ -29,18 +29,18 @@ Haptic feedback Strength - - Performance - Performance Settings - Choose your Performance settings - Choose your Performance settings + + Thermal + Thermal Settings + Choose your Thermal Profile + Choose your Thermal Profile - - Performance - Battery - Gaming - Balance - Extreme Battery + + Performance + Battery + Gaming + Balance + Extreme Battery Audio diff --git a/XiaomiParts/res/xml/preferences_xiaomi_parts.xml b/XiaomiParts/res/xml/preferences_xiaomi_parts.xml index 14f31778..f0e16a76 100644 --- a/XiaomiParts/res/xml/preferences_xiaomi_parts.xml +++ b/XiaomiParts/res/xml/preferences_xiaomi_parts.xml @@ -57,18 +57,18 @@ + android:key="thermal_profile" + android:title="@string/thermal_profile_title"> + android:dialogTitle="@string/thermal_dialogTitle" + android:entries="@array/thermal_profiles" + android:entryValues="@array/thermal_values" + android:key="thermal" + android:summary="@string/thermal_summary" + android:title="@string/thermal_title" + android:icon="@drawable/ic_thermal" /> diff --git a/XiaomiParts/src/org/lineageos/settings/device/BootReceiver.java b/XiaomiParts/src/org/lineageos/settings/device/BootReceiver.java index 1cf19bf7..0b803641 100644 --- a/XiaomiParts/src/org/lineageos/settings/device/BootReceiver.java +++ b/XiaomiParts/src/org/lineageos/settings/device/BootReceiver.java @@ -55,8 +55,8 @@ public class BootReceiver extends BroadcastReceiver implements Utils { FileUtils.setValue(DeviceSettings.VIBRATION_STRENGTH_PATH, Settings.Secure.getInt( context.getContentResolver(), DeviceSettings.PREF_VIBRATION_STRENGTH, 80) / 100.0 * (DeviceSettings.MAX_VIBRATION - DeviceSettings.MIN_VIBRATION) + DeviceSettings.MIN_VIBRATION); - FileUtils.setValue(DeviceSettings.SPECTRUM_PATH, Settings.Secure.getString( - context.getContentResolver(), DeviceSettings.PREF_SPECTRUM)); + FileUtils.setValue(DeviceSettings.THERMAL_PATH, Settings.Secure.getString( + context.getContentResolver(), DeviceSettings.PREF_THERMAL)); FileUtils.setValue(DeviceSettings.HALL_WAKEUP_PATH, Settings.Secure.getInt( context.getContentResolver(), DeviceSettings.PREF_HALL_WAKEUP, 1) == 1 ? "Y" : "N"); context.startService(new Intent(context, DiracService.class)); diff --git a/XiaomiParts/src/org/lineageos/settings/device/DeviceSettings.java b/XiaomiParts/src/org/lineageos/settings/device/DeviceSettings.java index b932929c..5355d8b7 100644 --- a/XiaomiParts/src/org/lineageos/settings/device/DeviceSettings.java +++ b/XiaomiParts/src/org/lineageos/settings/device/DeviceSettings.java @@ -42,8 +42,8 @@ public class DeviceSettings extends PreferenceFragment implements private static final String PREF_DEVICE_DOZE = "device_doze"; private static final String PREF_DEVICE_KCAL = "device_kcal"; - public static final String PREF_SPECTRUM = "spectrum"; - public static final String SPECTRUM_PATH = "/sys/devices/virtual/thermal/thermal_message/sconfig"; + public static final String PREF_THERMAL = "thermal"; + public static final String THERMAL_PATH = "/sys/devices/virtual/thermal/thermal_message/sconfig"; private static final String PREF_ENABLE_DIRAC = "dirac_enabled"; private static final String PREF_HEADSET = "dirac_headset_pref"; @@ -55,7 +55,7 @@ public class DeviceSettings extends PreferenceFragment implements private static final String DEVICE_DOZE_PACKAGE_NAME = "org.lineageos.settings.doze"; - private SecureSettingListPreference mSPECTRUM; + private SecureSettingListPreference mTHERMAL; @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { @@ -78,10 +78,10 @@ public class DeviceSettings extends PreferenceFragment implements return true; }); - mSPECTRUM = (SecureSettingListPreference) findPreference(PREF_SPECTRUM); - mSPECTRUM.setValue(FileUtils.getValue(SPECTRUM_PATH)); - mSPECTRUM.setSummary(mSPECTRUM.getEntry()); - mSPECTRUM.setOnPreferenceChangeListener(this); + mTHERMAL = (SecureSettingListPreference) findPreference(PREF_THERMAL); + mTHERMAL.setValue(FileUtils.getValue(THERMAL_PATH)); + mTHERMAL.setSummary(mTHERMAL.getEntry()); + mTHERMAL.setOnPreferenceChangeListener(this); boolean enhancerEnabled; try { @@ -119,10 +119,10 @@ public class DeviceSettings extends PreferenceFragment implements FileUtils.setValue(VIBRATION_STRENGTH_PATH, vibrationValue); break; - case PREF_SPECTRUM: - mSPECTRUM.setValue((String) value); - mSPECTRUM.setSummary(mSPECTRUM.getEntry()); - FileUtils.setValue(SPECTRUM_PATH, (String) value); + case PREF_THERMAL: + mTHERMAL.setValue((String) value); + mTHERMAL.setSummary(mTHERMAL.getEntry()); + FileUtils.setValue(THERMAL_PATH, (String) value); break; case PREF_ENABLE_DIRAC: diff --git a/XiaomiParts/src/org/lineageos/settings/device/PerformanceTileService.java b/XiaomiParts/src/org/lineageos/settings/device/PerformanceTileService.java index db5fcc9e..9526241f 100644 --- a/XiaomiParts/src/org/lineageos/settings/device/PerformanceTileService.java +++ b/XiaomiParts/src/org/lineageos/settings/device/PerformanceTileService.java @@ -8,11 +8,11 @@ public class PerformanceTileService extends TileService { @Override public void onStartListening() { - int currentState = Integer.parseInt(FileUtils.getValue(DeviceSettings.SPECTRUM_PATH)); + int currentState = Integer.parseInt(FileUtils.getValue(DeviceSettings.THERMAL_PATH)); Tile tile = getQsTile(); tile.setState(Tile.STATE_ACTIVE); - tile.setLabel(getResources().getStringArray(R.array.spectrum_profiles)[currentState]); + tile.setLabel(getResources().getStringArray(R.array.thermal_profiles)[currentState]); tile.updateTile(); super.onStartListening(); @@ -20,7 +20,7 @@ public class PerformanceTileService extends TileService { @Override public void onClick() { - int currentState = Integer.parseInt(FileUtils.getValue(DeviceSettings.SPECTRUM_PATH)); + int currentState = Integer.parseInt(FileUtils.getValue(DeviceSettings.THERMAL_PATH)); int nextState; if (currentState == 4) { @@ -30,8 +30,8 @@ public class PerformanceTileService extends TileService { } Tile tile = getQsTile(); - FileUtils.setValue(DeviceSettings.SPECTRUM_PATH, nextState); - tile.setLabel(getResources().getStringArray(R.array.spectrum_profiles)[nextState]); + FileUtils.setValue(DeviceSettings.THERMAL_PATH, nextState); + tile.setLabel(getResources().getStringArray(R.array.thermal_profiles)[nextState]); tile.updateTile(); super.onClick();