diff options
| author | John Spurlock <jspurlock@google.com> | 2013-09-17 18:07:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-17 18:07:25 +0000 |
| commit | 80645121fbba6f038feb48026d935b31028463d7 (patch) | |
| tree | 52bf37a980b61001867ab3fd3d8a103c893f0b3c | |
| parent | fbd67258e13d919f83f66f4e8a948f86aa507c26 (diff) | |
| parent | d19877f8a3557702d87bc9ed8c4be947e947b8b7 (diff) | |
| download | frameworks_base-80645121fbba6f038feb48026d935b31028463d7.zip frameworks_base-80645121fbba6f038feb48026d935b31028463d7.tar.gz frameworks_base-80645121fbba6f038feb48026d935b31028463d7.tar.bz2 | |
Merge "BatteryMeterView: Charging trumps empty." into klp-dev
| -rwxr-xr-x | packages/SystemUI/src/com/android/systemui/BatteryMeterView.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java index 2257617..2be8ee5 100755 --- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java @@ -292,11 +292,7 @@ public class BatteryMeterView extends View implements DemoMode { c.drawRect(mFrame, mBatteryPaint); c.restore(); - if (level <= EMPTY) { - final float x = mWidth * 0.5f; - final float y = (mHeight + mWarningTextHeight) * 0.48f; - c.drawText(mWarningString, x, y, mWarningTextPaint); - } else if (tracker.plugged) { + if (tracker.plugged) { // draw the bolt final int bl = (int)(mFrame.left + width / 4f); 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()); } 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)) { mTextPaint.setTextSize(height * (SINGLE_DIGIT_PERCENT ? 0.75f |