Merge branch 'v1-t' into 'v2.0-t' (e854085c) · Commits · e / os / android_frameworks_libs_systemui

iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java

+6 −8

Original line number	Diff line number	Diff line
		@@ -149,11 +149,9 @@ public class DotRenderer {
		float dx = dotCenterX + offsetX;
		float dy = dotCenterY + offsetY - 15f;

		if (numNotifications > 9 && numNotifications < 100) {
		canvas.translate(dx - 3f, dy);
		} else if (numNotifications > 99 && numNotifications < 1000) {
		canvas.translate(dx + 6f, dy);
		} else {
		if (numNotifications > 9 && numNotifications < 1000) {
		canvas.translate(dx - 17f, dy);
		} else if (numNotifications > 0) {
		canvas.translate(dx - 12f, dy);
		}

		@@ -165,7 +163,7 @@ public class DotRenderer {
		if (numNotifications >= 10 && numNotifications < 1000) {
		canvas.drawRoundRect(new RectF(-mCircleRadius + 10, -mCircleRadius, mCircleRadius + 20, mCircleRadius), 50, 50, mCircleShadowPaint);
		canvas.drawRoundRect(new RectF(-mCircleRadius + 10, -mCircleRadius, mCircleRadius + 20, mCircleRadius), 50, 50, mCirclePaint);
		} else {
		} else if (numNotifications > 0) {
		canvas.drawCircle(5, 10, mCircleRadius, mCircleShadowPaint);
		canvas.drawCircle(5, 10, mCircleRadius, mCirclePaint);
		}
		@@ -181,11 +179,11 @@ public class DotRenderer {
		if (numNotifications < 10) {
		canvas.drawText(text, -4f, 22f, mTextPaint);
		} else if (numNotifications < 100) {
		canvas.drawText(text, -4f, y, mTextPaint);
		canvas.drawText(text, -3f, y, mTextPaint);
		} else if (numNotifications >= 1000) {
		canvas.drawText(text, -14f, 20f, mTextPaint);
		} else {
		canvas.drawText(text, -14f, y, mTextPaint);
		canvas.drawText(text, -12f, y, mTextPaint);
		}
		}