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

Merge "Update keyguard charging text to indicate wireless" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-19 18:02:30 +00:00
committed by Android (Google) Code Review
parent 8098c5f1a8 f63da1e99e
commit 06cfb175bd
3 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res-keyguard/values/strings.xml
View File

@@ -64,6 +64,9 @@
charged, say that it is charged. --> charged, say that it is charged. -->
<string name="keyguard_charged">Charged</string> <string name="keyguard_charged">Charged</string>
<!-- When the lock screen is showing and the phone plugged in, and the battery is not fully charged, say that it's wirelessly charging. [CHAR LIMIT=50] -->
<string name="keyguard_plugged_in_wireless"><xliff:g id="percentage" example="20%">%s</xliff:g> • Wirelessly Charging</string>
<!-- When the lock screen is showing and the phone plugged in, and the battery <!-- When the lock screen is showing and the phone plugged in, and the battery
is not fully charged, say that it's charging. --> is not fully charged, say that it's charging. -->
<string name="keyguard_plugged_in"><xliff:g id="percentage">%s</xliff:g> • Charging</string> <string name="keyguard_plugged_in"><xliff:g id="percentage">%s</xliff:g> • Charging</string>

3
packages/SystemUI/res/values/strings.xml
View File

@@ -955,6 +955,9 @@
<!-- Interruption level: Alarms only. Optimized for narrow two-line display. [CHAR LIMIT=40] --> <!-- Interruption level: Alarms only. Optimized for narrow two-line display. [CHAR LIMIT=40] -->
<string name="interruption_level_alarms_twoline">Alarms\nonly</string> <string name="interruption_level_alarms_twoline">Alarms\nonly</string>
<!-- Indication on the keyguard that is shown when the device is wirelessly charging. [CHAR LIMIT=80]-->
<string name="keyguard_indication_charging_time_wireless"><xliff:g id="percentage" example="20%">%2$s</xliff:g> • Wirelessly Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%1$s</xliff:g> until full)</string>
<!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=50]--> <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=50]-->
<string name="keyguard_indication_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> until full)</string> <string name="keyguard_indication_charging_time"><xliff:g id="percentage">%2$s</xliff:g> • Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> until full)</string>

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

@@ -395,6 +395,7 @@ public class KeyguardIndicationController {
final boolean hasChargingTime = chargingTimeRemaining > 0; final boolean hasChargingTime = chargingTimeRemaining > 0;
int chargingId; int chargingId;
if (mPowerPluggedInWired) {
switch (mChargingSpeed) { switch (mChargingSpeed) {
case KeyguardUpdateMonitor.BatteryStatus.CHARGING_FAST: case KeyguardUpdateMonitor.BatteryStatus.CHARGING_FAST:
chargingId = hasChargingTime chargingId = hasChargingTime
@@ -412,6 +413,11 @@ public class KeyguardIndicationController {
: R.string.keyguard_plugged_in; : R.string.keyguard_plugged_in;
break; break;
} }
} else {
chargingId = hasChargingTime
? R.string.keyguard_indication_charging_time_wireless
: R.string.keyguard_plugged_in_wireless;
}
String percentage = NumberFormat.getPercentInstance() String percentage = NumberFormat.getPercentInstance()
.format(mBatteryLevel / 100f); .format(mBatteryLevel / 100f);