diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-11-30 07:34:53 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-30 07:34:53 -0800 |
| commit | 9e3efb9155461ceee6cd72824e0981b091fa44d9 (patch) | |
| tree | 4836897d3f10fe474ea4ed788756388e34568fdf /policy/src | |
| parent | 3ce74b24d824b8630be69da73a940bb170fa02ff (diff) | |
| parent | d1b73fc17ca222cc627c932625efe9c3c1ad3b0c (diff) | |
| download | frameworks_base-9e3efb9155461ceee6cd72824e0981b091fa44d9.zip frameworks_base-9e3efb9155461ceee6cd72824e0981b091fa44d9.tar.gz frameworks_base-9e3efb9155461ceee6cd72824e0981b091fa44d9.tar.bz2 | |
am d1b73fc1: am 71988c81: am 386165a3: Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
* commit 'd1b73fc17ca222cc627c932625efe9c3c1ad3b0c':
Only show "charging" if the battery is really charging.
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardMessageArea.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMessageArea.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMessageArea.java index ee5c4a6..210312a 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMessageArea.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMessageArea.java @@ -21,6 +21,7 @@ import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; import android.content.ContentResolver; import android.content.Context; +import android.os.BatteryManager; import android.os.Handler; import android.os.Looper; import android.os.UserHandle; @@ -51,7 +52,7 @@ class KeyguardMessageArea extends TextView { boolean mShowingBouncer = false; // last known plugged in state - boolean mPluggedIn = false; + boolean mCharging = false; // last known battery level int mBatteryLevel = 100; @@ -134,7 +135,8 @@ class KeyguardMessageArea extends TextView { @Override public void onRefreshBatteryInfo(KeyguardUpdateMonitor.BatteryStatus status) { mShowingBatteryInfo = status.isPluggedIn() || status.isBatteryLow(); - mPluggedIn = status.isPluggedIn(); + mCharging = status.status == BatteryManager.BATTERY_STATUS_CHARGING + || status.status == BatteryManager.BATTERY_STATUS_FULL; mBatteryLevel = status.level; mBatteryCharged = status.isCharged(); mBatteryIsLow = status.isBatteryLow(); @@ -223,11 +225,11 @@ class KeyguardMessageArea extends TextView { CharSequence string = null; if (mShowingBatteryInfo && !mShowingMessage) { // Battery status - if (mPluggedIn) { + if (mCharging) { // Charging, charged or waiting to charge. - string = getContext().getString(mBatteryCharged ? - com.android.internal.R.string.lockscreen_charged - :com.android.internal.R.string.lockscreen_plugged_in, mBatteryLevel); + string = getContext().getString(mBatteryCharged + ? com.android.internal.R.string.lockscreen_charged + : com.android.internal.R.string.lockscreen_plugged_in, mBatteryLevel); icon.value = CHARGING_ICON; } else if (mBatteryIsLow) { // Battery is low |