Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4673b259 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Show charging speed in all locales" into mnc-dr-dev

parents 50e79632 f142cac7

packages/SystemUI/res/values-en/donottranslate.xml

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2015 The Android Open Source 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

  -->



<resources>

    <!-- DO NOT TRANSLATE - temporary hack to show the speed-less label if no translation is available -->

    <item type="string" name="keyguard_indication_charging_time_fast_if_translated">@string/keyguard_indication_charging_time_fast</item>

    <!-- DO NOT TRANSLATE - temporary hack to show the speed-less label if no translation is available -->

    <item type="string" name="keyguard_indication_charging_time_slowly_if_translated">@string/keyguard_indication_charging_time_slowly</item>

</resources>
 
 No newline at end of file

packages/SystemUI/res/values/donottranslate.xml

+0 −6
Original line number Diff line number Diff line
@@ -20,10 +20,4 @@ 
    <!-- Date format for display: should match the lockscreen in /policy.  -->

    <string name="system_ui_date_pattern">@*android:string/system_ui_date_pattern</string>



    <!-- DO NOT TRANSLATE - temporary hack to show the speed-less label if no translation is available -->

    <item type="string" name="keyguard_indication_charging_time_fast_if_translated">@string/keyguard_indication_charging_time</item>



    <!-- DO NOT TRANSLATE - temporary hack to show the speed-less label if no translation is available -->

    <item type="string" name="keyguard_indication_charging_time_slowly_if_translated">@string/keyguard_indication_charging_time</item>



</resources>

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+2 −2
Original line number Diff line number Diff line
@@ -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: