Bring up 1 Day View

Change-Id: I1ba771c71d9a4be4636b782ec8cb6f4793b33ed5

5 files changed, 13 insertions, 7 deletions

diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index 9fd9504c..8ef8ef53 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -193,8 +193,10 @@ public class AllInOneActivity extends Activity implements EventHandler,
                 frag = new AgendaFragment(timeMillis);
                 break;
             case ViewType.DAY:
+                frag = new DayFragment(timeMillis, 1);
+                break;
             case ViewType.WEEK:
-                frag = new DayFragment(timeMillis);
+                frag = new DayFragment(timeMillis, 7);
                 break;
             case ViewType.MONTH:
                 frag = new MonthFragment(false, timeMillis);
diff --git a/src/com/android/calendar/CalendarView.java b/src/com/android/calendar/CalendarView.java
index 4cfaf49c..ba88ea05 100644
--- a/src/com/android/calendar/CalendarView.java
+++ b/src/com/android/calendar/CalendarView.java
@@ -344,7 +344,7 @@ public class CalendarView extends View
     private GestureDetector mGestureDetector;
 
     public CalendarView(Context context, CalendarController controller,
-            ViewSwitcher viewSwitcher, EventLoader eventLoader) {
+            ViewSwitcher viewSwitcher, EventLoader eventLoader, int numDays) {
         super(context);
         if (mScale == 0) {
             mScale = getContext().getResources().getDisplayMetrics().density;
@@ -385,6 +385,7 @@ public class CalendarView extends View
         mController = controller;
         mViewSwitcher = viewSwitcher;
         mGestureDetector = new GestureDetector(context, new CalendarGestureListener());
+        mNumDays = numDays;
 
         init(context);
     }
diff --git a/src/com/android/calendar/DayFragment.java b/src/com/android/calendar/DayFragment.java
index c39a7bbd..131d0e64 100644
--- a/src/com/android/calendar/DayFragment.java
+++ b/src/com/android/calendar/DayFragment.java
@@ -94,11 +94,14 @@ public class DayFragment extends Fragment implements CalendarController.EventHan
         }
     };
 
+    private int mNumDays;
+
     public DayFragment() {
         mSelectedDay.setToNow();
     }
 
-    public DayFragment(long timeMillis) {
+    public DayFragment(long timeMillis, int numOfDays) {
+        mNumDays = numOfDays;
         if (timeMillis == 0) {
             mSelectedDay.setToNow();
         } else {
@@ -147,7 +150,7 @@ public class DayFragment extends Fragment implements CalendarController.EventHan
 
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.week_activity, null);
+        View v = inflater.inflate(R.layout.day_activity, null);
 
         mViewSwitcher = (ViewSwitcher) v.findViewById(R.id.switcher);
         mViewSwitcher.setFactory(this);
@@ -158,7 +161,7 @@ public class DayFragment extends Fragment implements CalendarController.EventHan
 
     public View makeView() {
         CalendarView view = new CalendarView(getActivity(), CalendarController
-                .getInstance(getActivity()), mViewSwitcher, mEventLoader);
+                .getInstance(getActivity()), mViewSwitcher, mEventLoader, mNumDays);
         view.setId(VIEW_ID);
         view.setLayoutParams(new ViewSwitcher.LayoutParams(
                 LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
diff --git a/src/com/android/calendar/DayView.java b/src/com/android/calendar/DayView.java
index 8d00e533..5cdfddbc 100644
--- a/src/com/android/calendar/DayView.java
+++ b/src/com/android/calendar/DayView.java
@@ -25,7 +25,7 @@ public class DayView extends CalendarView {
 
     public DayView(Context activity, CalendarController controller,
             ViewSwitcher viewSwitcher, EventLoader eventLoader) {
-        super(activity, controller, viewSwitcher, eventLoader);
+        super(activity, controller, viewSwitcher, eventLoader, 1);
         init();
     }
 
diff --git a/src/com/android/calendar/WeekView.java b/src/com/android/calendar/WeekView.java
index 9204c78d..808bcce8 100644
--- a/src/com/android/calendar/WeekView.java
+++ b/src/com/android/calendar/WeekView.java
@@ -25,7 +25,7 @@ public class WeekView extends CalendarView {
 
     public WeekView(Context activity, CalendarController controller,
             ViewSwitcher viewSwitcher, EventLoader eventLoader) {
-        super(activity, controller, viewSwitcher, eventLoader);
+        super(activity, controller, viewSwitcher, eventLoader, 7);
         init();
     }