Merge "Animate circle battery rotation back to 0 after unplugging" into cm-11.0 (8e3290e6) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -705,7 +705,6 @@ public class BatteryMeterView extends View implements DemoMode {
		private void drawCircle(Canvas canvas, BatteryTracker tracker,
		float textX, RectF drawRect) {
		boolean unknownStatus = tracker.status == BatteryManager.BATTERY_STATUS_UNKNOWN;
		int animOffset = tracker.shouldIndicateCharging() ? mAnimOffset : 0;
		int level = tracker.level;
		Paint paint;

		@@ -723,7 +722,7 @@ public class BatteryMeterView extends View implements DemoMode {
		// draw thin gray ring first
		canvas.drawArc(drawRect, 270, 360, false, mBackPaint);
		// draw colored arc representing charge level
		canvas.drawArc(drawRect, 270 + animOffset, 3.6f * level, false, paint);
		canvas.drawArc(drawRect, 270 + mAnimOffset, 3.6f * level, false, paint);
		// if chosen by options, draw percentage text in the middle
		// always skip percentage when 100, so layout doesnt break
		if (unknownStatus) {
		@@ -766,7 +765,9 @@ public class BatteryMeterView extends View implements DemoMode {
		* uses mInvalidate for delayed invalidate() callbacks
		*/
		private void updateChargeAnim(BatteryTracker tracker) {
		if (!tracker.shouldIndicateCharging()
		// Stop animation when battery is full or after the meter
		// rotated back to 0 after unplugging.
		if (!tracker.shouldIndicateCharging() && mAnimOffset == 0
		\|\| tracker.status == BatteryManager.BATTERY_STATUS_FULL) {
		if (mIsAnimating) {
		mIsAnimating = false;