commit 7be65caf4efa310c1b28cc74278eb0f8327039c8
author Isaac Katzenelson <isaack@android.com> Mon May 07 18:06:34 2012 -0700
committer Isaac Katzenelson <isaack@android.com> Tue May 08 10:44:34 2012 -0700
tree 6899b14b3c65a4eb40537b8a2569185ddd30c06a
parent 42ba5efed5945b0e96735ec9ca4b388ae35b56f7

Fix today icon

Bug: 5429738 Today icon should display the current day number

Change-Id: I3296efe861ac92f66189eaba01ce190822e87c02

src/com/android/calendar/DayOfMonthDrawable.java

diff --git a/src/com/android/calendar/DayOfMonthDrawable.java b/src/com/android/calendar/DayOfMonthDrawable.java
index 8f52acb..9bfc85c 100644
--- a/src/com/android/calendar/DayOfMonthDrawable.java
+++ b/src/com/android/calendar/DayOfMonthDrawable.java
@@ -16,14 +16,14 @@
 
 package com.android.calendar;
 
+import android.content.Context;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.ColorFilter;
 import android.graphics.Paint;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
+import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import android.util.Log;
 
 
 
@@ -34,15 +34,18 @@
 
 public class DayOfMonthDrawable extends Drawable {
 
-    String mDayOfMonth = "1";
-    Paint mPaint;
-    Rect mTextBounds = new Rect();
+    private String mDayOfMonth = "1";
+    private final Paint mPaint;
+    private final Rect mTextBounds = new Rect();
+    private static float mTextSize = 14;
 
-    public DayOfMonthDrawable() {
+    public DayOfMonthDrawable(Context c) {
+        mTextSize = c.getResources().getDimension(R.dimen.today_icon_text_size);
         mPaint = new Paint();
         mPaint.setAlpha(255);
         mPaint.setColor(0xFF777777);
-        mPaint.setTextSize(12);
+        mPaint.setTypeface(Typeface.DEFAULT_BOLD);
+        mPaint.setTextSize(mTextSize);
     }
 
     @Override
@@ -51,8 +54,8 @@
         int textWidth = mTextBounds.right - mTextBounds.left;
         int textHeight = mTextBounds.bottom - mTextBounds.top;
         Rect bounds = getBounds();
-        canvas.drawText(mDayOfMonth, bounds.right / 2 - textWidth / 2 - 1,
-                bounds.bottom / 2 + textHeight / 2 + 1, mPaint);
+        canvas.drawText(mDayOfMonth, ((float)(bounds.right - textWidth)) / 2,
+                ((float)bounds.bottom + textHeight) / 2, mPaint);
     }
 
     @Override