Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adrian Roos
2015-10-13 22:55:11 +00:00
committed by Android (Google) Code Review
parent 50e796326a f142cac734
commit 4673b259bc
3 changed files with 2 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/SystemUI/res/values-en/donottranslate.xml
View File

@@ -1,23 +0,0 @@
<?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>

6
packages/SystemUI/res/values/donottranslate.xml
View File

@@ -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>

4
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@@ -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: