diff --git a/packages/SystemUI/res/values-en/donottranslate.xml b/packages/SystemUI/res/values-en/donottranslate.xml deleted file mode 100644 index 9f04e1f50b147..0000000000000 --- a/packages/SystemUI/res/values-en/donottranslate.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - @string/keyguard_indication_charging_time_fast - - @string/keyguard_indication_charging_time_slowly - \ No newline at end of file diff --git a/packages/SystemUI/res/values/donottranslate.xml b/packages/SystemUI/res/values/donottranslate.xml index 30ff7043f6880..351a1fdbda07a 100644 --- a/packages/SystemUI/res/values/donottranslate.xml +++ b/packages/SystemUI/res/values/donottranslate.xml @@ -20,10 +20,4 @@ @*android:string/system_ui_date_pattern - - @string/keyguard_indication_charging_time - - - @string/keyguard_indication_charging_time - diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java index 50d274d4fcc7b..fd84345e9f775 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -200,12 +200,12 @@ public class KeyguardIndicationController { switch (mChargingSpeed) { case KeyguardUpdateMonitor.BatteryStatus.CHARGING_FAST: chargingId = hasChargingTime - ? R.string.keyguard_indication_charging_time_fast_if_translated + ? R.string.keyguard_indication_charging_time_fast : R.string.keyguard_plugged_in_charging_fast; break; case KeyguardUpdateMonitor.BatteryStatus.CHARGING_SLOWLY: chargingId = hasChargingTime - ? R.string.keyguard_indication_charging_time_slowly_if_translated + ? R.string.keyguard_indication_charging_time_slowly : R.string.keyguard_plugged_in_charging_slowly; break; default: