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

Merge "BatteryMeterView: Charging trumps empty." into klp-dev

Browse Source
This commit is contained in:
John Spurlock
2013-09-17 18:07:24 +00:00
committed by Android (Google) Code Review
parent fbd67258e1 d19877f8a3
commit 80645121fb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
View File

@@ -292,11 +292,7 @@ public class BatteryMeterView extends View implements DemoMode {
c.drawRect(mFrame, mBatteryPaint); c.drawRect(mFrame, mBatteryPaint);
c.restore(); c.restore();
if (level <= EMPTY) { if (tracker.plugged) {
final float x = mWidth * 0.5f;
final float y = (mHeight + mWarningTextHeight) * 0.48f;
c.drawText(mWarningString, x, y, mWarningTextPaint);
} else if (tracker.plugged) {
// draw the bolt // draw the bolt
final int bl = (int)(mFrame.left + width / 4f); final int bl = (int)(mFrame.left + width / 4f);
final int bt = (int)(mFrame.top + height / 6f); final int bt = (int)(mFrame.top + height / 6f);
@@ -319,6 +315,10 @@ public class BatteryMeterView extends View implements DemoMode {
mBoltFrame.top + mBoltPoints[1] * mBoltFrame.height()); mBoltFrame.top + mBoltPoints[1] * mBoltFrame.height());
} }
c.drawPath(mBoltPath, mBoltPaint); c.drawPath(mBoltPath, mBoltPaint);
} else if (level <= EMPTY) {
final float x = mWidth * 0.5f;
final float y = (mHeight + mWarningTextHeight) * 0.48f;
c.drawText(mWarningString, x, y, mWarningTextPaint);
} else if (mShowPercent && !(tracker.level == 100 && !SHOW_100_PERCENT)) { } else if (mShowPercent && !(tracker.level == 100 && !SHOW_100_PERCENT)) {
mTextPaint.setTextSize(height * mTextPaint.setTextSize(height *
(SINGLE_DIGIT_PERCENT ? 0.75f (SINGLE_DIGIT_PERCENT ? 0.75f