am 7db439ee: Fix bug 1317754 - "Idle screen displays "Charging (100%)" even when fully charged."
Merge commit '7db439ee518b97881625f13ee738ecb891b573a8' * commit '7db439ee518b97881625f13ee738ecb891b573a8': Fix bug 1317754 - "Idle screen displays "Charging (100%)" even when fully charged."
This commit is contained in:
committed by
The Android Open Source Project
commit
bea76ea3d0
@@ -279,8 +279,12 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM
|
||||
|
||||
if (mPluggedIn) {
|
||||
mBatteryInfoIcon.setImageResource(R.drawable.ic_lock_idle_charging);
|
||||
mBatteryInfoText.setText(
|
||||
getContext().getString(R.string.lockscreen_plugged_in, mBatteryLevel));
|
||||
if (mBatteryLevel >= 100) {
|
||||
mBatteryInfoText.setText(R.string.lockscreen_charged);
|
||||
} else {
|
||||
mBatteryInfoText.setText(
|
||||
getContext().getString(R.string.lockscreen_plugged_in, mBatteryLevel));
|
||||
}
|
||||
} else {
|
||||
mBatteryInfoIcon.setImageResource(R.drawable.ic_lock_idle_low_battery);
|
||||
mBatteryInfoText.setText(R.string.lockscreen_low_battery);
|
||||
|
||||
Reference in New Issue
Block a user