b/2600474 Changed colors for Sat/Sun

To a dull blue and moved busybits and background colors into xml.

Change-Id: I21191c3bc25748dcd312d5ea84113dad3d40caf2

2 files changed, 13 insertions, 10 deletions

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 06ac40c9..b586f0e7 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -22,15 +22,15 @@
     <color name="panel_text_foreground">#ffffffff</color>
     <color name="daynames_background">#FFDDDDDD</color>
     <color name="daynames_text_color">#ff000000</color>
-    <color name="sunday_text_color">#ffcc2222</color>
-    <color name="saturday_text_color">#ff2222cc</color>
+    <color name="sunday_text_color">#ff446688</color>
+    <color name="saturday_text_color">#ff446688</color>
     <color name="calendar_event_selected_text_color">#ff000000</color>
     <color name="calendar_event_text_color">#ffffffff</color>
     <color name="calendar_owner_text_color">#ffbebebe</color>
 
     <color name="calendar_all_day_background">#ffDDDDDD</color>
-    <color name="week_saturday">#ff2222cc</color>
-    <color name="week_sunday">#ffcc2222</color>
+    <color name="week_saturday">#ff446688</color>
+    <color name="week_sunday">#ff446688</color>
     <color name="calendar_hour_label">#ff000000</color>
     <color name="calendar_ampm_label">#ff000000</color>
     <color name="calendar_hour_background">#ffDDDDDD</color>
@@ -54,6 +54,8 @@
     <color name="month_other_month_day_number">#ffa0a0a0</color>
     <color name="month_other_month_banner">#80595959</color>
     <color name="month_week_banner">#FFDDDDDD</color>
+    <color name="month_busybits">#FF6090F0</color>
+    <color name="month_bgcolor">#FFDDDDDD</color>
 
     <color name="event_center">#ff6bd697</color>
 
diff --git a/src/com/android/calendar/MonthView.java b/src/com/android/calendar/MonthView.java
index c6aace3b..ee2878ca 100644
--- a/src/com/android/calendar/MonthView.java
+++ b/src/com/android/calendar/MonthView.java
@@ -81,9 +81,6 @@ public class MonthView extends View implements View.OnCreateContextMenuListener
 
     private static int HORIZONTAL_FLING_THRESHOLD = 50;
 
-    private static final int BUSY_BITS_COLOR = 0xFF6090F0;
-    private static final int LIGHT_GRAY_BGCOLOR = 0xFFDDDDDD;
-
     private int mCellHeight;
     private int mBorder;
     private boolean mLaunchDayView;
@@ -184,6 +181,8 @@ public class MonthView extends View implements View.OnCreateContextMenuListener
     private int mMonthTodayNumberColor;
     private int mMonthSaturdayColor;
     private int mMonthSundayColor;
+    private int mBusybitsColor;
+    private int mMonthBgColor;
 
     public MonthView(MonthActivity activity, Navigator navigator) {
         super(activity);
@@ -255,6 +254,8 @@ public class MonthView extends View implements View.OnCreateContextMenuListener
         mMonthTodayNumberColor = res.getColor(R.color.month_today_number);
         mMonthSaturdayColor = res.getColor(R.color.month_saturday);
         mMonthSundayColor = res.getColor(R.color.month_sunday);
+        mBusybitsColor = res.getColor(R.color.month_busybits);
+        mMonthBgColor = res.getColor(R.color.month_bgcolor);
 
         if (mShowToast) {
             LayoutInflater inflater;
@@ -738,7 +739,7 @@ public class MonthView extends View implements View.OnCreateContextMenuListener
                 r.left--;
             }
             p.setStyle(Style.FILL);
-            p.setColor(LIGHT_GRAY_BGCOLOR);
+            p.setColor(mMonthBgColor);
             canvas.drawRect(r, p);
         } else if (drawSelection) {
             if (mSelectionMode == SELECTION_SELECTED) {
@@ -859,7 +860,7 @@ public class MonthView extends View implements View.OnCreateContextMenuListener
             rf.bottom = rect.bottom - BUSY_BITS_MARGIN;
             rf.top = top;
 
-            p.setColor(LIGHT_GRAY_BGCOLOR);
+            p.setColor(mMonthBgColor);
             p.setStyle(Style.FILL);
             canvas.drawRect(rf, p);
         }
@@ -877,7 +878,7 @@ public class MonthView extends View implements View.OnCreateContextMenuListener
     // Draw busybits for a single event
     private RectF drawEventRect(Rect rect, Event event, Canvas canvas, Paint p) {
 
-        p.setColor(BUSY_BITS_COLOR);
+        p.setColor(mBusybitsColor);
 
         int left = rect.right - BUSY_BITS_MARGIN - BUSY_BITS_WIDTH;
         int bottom = rect.bottom - BUSY_BITS_MARGIN;