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

Merge "Fix 3388705: Explicitly check for low battery level" into honeycomb

Browse Source
This commit is contained in:
Joe Onorato
2011-01-26 22:21:26 -08:00
committed by Android (Google) Code Review
parent ea1fbe9c8c b92e18e2df
commit e193c4688f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java
View File

@@ -62,7 +62,7 @@ public class KeyguardUpdateMonitor {
static private final String TAG = "KeyguardUpdateMonitor";
static private final boolean DEBUG = false;
private static final int LOW_BATTERY_THRESHOLD = 20;
/* package */ static final int LOW_BATTERY_THRESHOLD = 20;
private final Context mContext;

7
policy/src/com/android/internal/policy/impl/StatusView.java
View File

@@ -193,12 +193,15 @@ class StatusView {
mBatteryLevel));
}
mStatus1.setCompoundDrawablesWithIntrinsicBounds(CHARGING_ICON, 0, 0, 0);
} else {
mStatus1.setVisibility(View.VISIBLE);
} else if (mBatteryLevel < KeyguardUpdateMonitor.LOW_BATTERY_THRESHOLD) {
// Battery is low
mStatus1.setText(getContext().getString(R.string.lockscreen_low_battery));
mStatus1.setCompoundDrawablesWithIntrinsicBounds(BATTERY_LOW_ICON, 0, 0, 0);
mStatus1.setVisibility(View.VISIBLE);
} else {
mStatus1.setVisibility(View.INVISIBLE);
}
mStatus1.setVisibility(View.VISIBLE);
} else {
// nothing specific to show; show help message and icon, if provided
if (mHelpMessageId != 0) {