Remove unneeded classes: MenuHelper, Day/Week View and Agenda/Day/Week/Month Activities

Change-Id: Id39e0529f6ff051de5deea23497b3f0f4f7fdb6b

13 files changed, 73 insertions, 493 deletions

diff --git a/src/com/android/calendar/AgendaActivity.java b/src/com/android/calendar/AgendaActivity.java
deleted file mode 100644
index b2f359e3..00000000
--- a/src/com/android/calendar/AgendaActivity.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.calendar;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.os.Bundle;
-
-public class AgendaActivity extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        Fragment f = new AgendaFragment();
-        openFragmentTransaction().add(android.R.id.content, f).commit();
-    }
-}
-
diff --git a/src/com/android/calendar/AgendaAdapter.java b/src/com/android/calendar/AgendaAdapter.java
index e54e3452..9df12012 100644
--- a/src/com/android/calendar/AgendaAdapter.java
+++ b/src/com/android/calendar/AgendaAdapter.java
@@ -129,7 +129,7 @@ public class AgendaAdapter extends ResourceCursorAdapter {
         /*
         // Repeating info
         View repeatContainer = view.findViewById(R.id.repeat_icon);
-        String rrule = cursor.getString(AgendaActivity.INDEX_RRULE);
+        String rrule = cursor.getString(AgendaWindowAdapter.INDEX_RRULE);
         if (rrule != null) {
             repeatContainer.setVisibility(View.VISIBLE);
         } else {
@@ -139,9 +139,9 @@ public class AgendaAdapter extends ResourceCursorAdapter {
 
         /*
         // Reminder
-        boolean hasAlarm = cursor.getInt(AgendaActivity.INDEX_HAS_ALARM) != 0;
+        boolean hasAlarm = cursor.getInt(AgendaWindowAdapter.INDEX_HAS_ALARM) != 0;
         if (hasAlarm) {
-            updateReminder(view, context, begin, cursor.getLong(AgendaActivity.INDEX_EVENT_ID));
+            updateReminder(view, context, begin, cursor.getLong(AgendaWindowAdapter.INDEX_EVENT_ID));
         }
         */
 
diff --git a/src/com/android/calendar/CalendarView.java b/src/com/android/calendar/CalendarView.java
index ba88ea05..b2f902c4 100644
--- a/src/com/android/calendar/CalendarView.java
+++ b/src/com/android/calendar/CalendarView.java
@@ -82,6 +82,13 @@ public class CalendarView extends View
     private static final long INVALID_EVENT_ID = -1; //This is used for remembering a null event
     private static final long ANIMATION_DURATION = 400;
 
+    private static final int MENU_AGENDA = 2;
+    private static final int MENU_DAY = 3;
+    private static final int MENU_EVENT_VIEW = 5;
+    private static final int MENU_EVENT_CREATE = 6;
+    private static final int MENU_EVENT_EDIT = 7;
+    private static final int MENU_EVENT_DELETE = 8;
+
     private boolean mOnFlingCalled;
     /**
      * ID of the last event which was displayed with the toast popup.
@@ -2514,15 +2521,14 @@ public class CalendarView extends View
 
     // The following routines are called from the parent activity when certain
     // touch events occur.
-
-    void doDown(MotionEvent ev) {
+    private void doDown(MotionEvent ev) {
         mTouchMode = TOUCH_MODE_DOWN;
         mViewStartX = 0;
         mOnFlingCalled = false;
         getHandler().removeCallbacks(mContinueScroll);
     }
 
-    void doSingleTapUp(MotionEvent ev) {
+    private void doSingleTapUp(MotionEvent ev) {
         int x = (int) ev.getX();
         int y = (int) ev.getY();
         int selectedDay = mSelectionDay;
@@ -2561,7 +2567,7 @@ public class CalendarView extends View
         }
     }
 
-    void doLongPress(MotionEvent ev) {
+    private void doLongPress(MotionEvent ev) {
         int x = (int) ev.getX();
         int y = (int) ev.getY();
 
@@ -2577,7 +2583,7 @@ public class CalendarView extends View
         performLongClick();
     }
 
-    void doScroll(MotionEvent e1, MotionEvent e2, float deltaX, float deltaY) {
+    private void doScroll(MotionEvent e1, MotionEvent e2, float deltaX, float deltaY) {
         // Use the distance from the current point to the initial touch instead
         // of deltaX and deltaY to avoid accumulating floating-point rounding
         // errors.  Also, we don't need floats, we can use ints.
@@ -2658,7 +2664,7 @@ public class CalendarView extends View
         invalidate();
     }
 
-    void doFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+    private void doFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
         mTouchMode = TOUCH_MODE_INITIAL_STATE;
         mSelectionMode = SELECTION_HIDDEN;
         mOnFlingCalled = true;
@@ -2797,32 +2803,32 @@ public class CalendarView extends View
             // If there is a selected event, then allow it to be viewed and
             // edited.
             if (numSelectedEvents >= 1) {
-                item = menu.add(0, MenuHelper.MENU_EVENT_VIEW, 0, R.string.event_view);
+                item = menu.add(0, MENU_EVENT_VIEW, 0, R.string.event_view);
                 item.setOnMenuItemClickListener(mContextMenuHandler);
                 item.setIcon(android.R.drawable.ic_menu_info_details);
 
                 int accessLevel = getEventAccessLevel(mContext, mSelectedEvent);
                 if (accessLevel == ACCESS_LEVEL_EDIT) {
-                    item = menu.add(0, MenuHelper.MENU_EVENT_EDIT, 0, R.string.event_edit);
+                    item = menu.add(0, MENU_EVENT_EDIT, 0, R.string.event_edit);
                     item.setOnMenuItemClickListener(mContextMenuHandler);
                     item.setIcon(android.R.drawable.ic_menu_edit);
                     item.setAlphabeticShortcut('e');
                 }
 
                 if (accessLevel >= ACCESS_LEVEL_DELETE) {
-                    item = menu.add(0, MenuHelper.MENU_EVENT_DELETE, 0, R.string.event_delete);
+                    item = menu.add(0, MENU_EVENT_DELETE, 0, R.string.event_delete);
                     item.setOnMenuItemClickListener(mContextMenuHandler);
                     item.setIcon(android.R.drawable.ic_menu_delete);
                 }
 
-                item = menu.add(0, MenuHelper.MENU_EVENT_CREATE, 0, R.string.event_create);
+                item = menu.add(0, MENU_EVENT_CREATE, 0, R.string.event_create);
                 item.setOnMenuItemClickListener(mContextMenuHandler);
                 item.setIcon(android.R.drawable.ic_menu_add);
                 item.setAlphabeticShortcut('n');
             } else {
                 // Otherwise, if the user long-pressed on a blank hour, allow
                 // them to create an event.  They can also do this by tapping.
-                item = menu.add(0, MenuHelper.MENU_EVENT_CREATE, 0, R.string.event_create);
+                item = menu.add(0, MENU_EVENT_CREATE, 0, R.string.event_create);
                 item.setOnMenuItemClickListener(mContextMenuHandler);
                 item.setIcon(android.R.drawable.ic_menu_add);
                 item.setAlphabeticShortcut('n');
@@ -2833,55 +2839,39 @@ public class CalendarView extends View
             // If there is a selected event, then allow it to be viewed and
             // edited.
             if (numSelectedEvents >= 1) {
-                item = menu.add(0, MenuHelper.MENU_EVENT_VIEW, 0, R.string.event_view);
+                item = menu.add(0, MENU_EVENT_VIEW, 0, R.string.event_view);
                 item.setOnMenuItemClickListener(mContextMenuHandler);
                 item.setIcon(android.R.drawable.ic_menu_info_details);
 
                 int accessLevel = getEventAccessLevel(mContext, mSelectedEvent);
                 if (accessLevel == ACCESS_LEVEL_EDIT) {
-                    item = menu.add(0, MenuHelper.MENU_EVENT_EDIT, 0, R.string.event_edit);
+                    item = menu.add(0, MENU_EVENT_EDIT, 0, R.string.event_edit);
                     item.setOnMenuItemClickListener(mContextMenuHandler);
                     item.setIcon(android.R.drawable.ic_menu_edit);
                     item.setAlphabeticShortcut('e');
                 }
 
                 if (accessLevel >= ACCESS_LEVEL_DELETE) {
-                    item = menu.add(0, MenuHelper.MENU_EVENT_DELETE, 0, R.string.event_delete);
+                    item = menu.add(0, MENU_EVENT_DELETE, 0, R.string.event_delete);
                     item.setOnMenuItemClickListener(mContextMenuHandler);
                     item.setIcon(android.R.drawable.ic_menu_delete);
                 }
+            }
 
-                item = menu.add(0, MenuHelper.MENU_EVENT_CREATE, 0, R.string.event_create);
-                item.setOnMenuItemClickListener(mContextMenuHandler);
-                item.setIcon(android.R.drawable.ic_menu_add);
-                item.setAlphabeticShortcut('n');
+            item = menu.add(0, MENU_EVENT_CREATE, 0, R.string.event_create);
+            item.setOnMenuItemClickListener(mContextMenuHandler);
+            item.setIcon(android.R.drawable.ic_menu_add);
+            item.setAlphabeticShortcut('n');
 
-                item = menu.add(0, MenuHelper.MENU_DAY, 0, R.string.show_day_view);
-                item.setOnMenuItemClickListener(mContextMenuHandler);
-                item.setIcon(android.R.drawable.ic_menu_day);
-                item.setAlphabeticShortcut('d');
+            item = menu.add(0, MENU_DAY, 0, R.string.show_day_view);
+            item.setOnMenuItemClickListener(mContextMenuHandler);
+            item.setIcon(android.R.drawable.ic_menu_day);
+            item.setAlphabeticShortcut('d');
 
-                item = menu.add(0, MenuHelper.MENU_AGENDA, 0, R.string.show_agenda_view);
-                item.setOnMenuItemClickListener(mContextMenuHandler);
-                item.setIcon(android.R.drawable.ic_menu_agenda);
-                item.setAlphabeticShortcut('a');
-            } else {
-                // No events are selected
-                item = menu.add(0, MenuHelper.MENU_EVENT_CREATE, 0, R.string.event_create);
-                item.setOnMenuItemClickListener(mContextMenuHandler);
-                item.setIcon(android.R.drawable.ic_menu_add);
-                item.setAlphabeticShortcut('n');
-
-                item = menu.add(0, MenuHelper.MENU_DAY, 0, R.string.show_day_view);
-                item.setOnMenuItemClickListener(mContextMenuHandler);
-                item.setIcon(android.R.drawable.ic_menu_day);
-                item.setAlphabeticShortcut('d');
-
-                item = menu.add(0, MenuHelper.MENU_AGENDA, 0, R.string.show_agenda_view);
-                item.setOnMenuItemClickListener(mContextMenuHandler);
-                item.setIcon(android.R.drawable.ic_menu_agenda);
-                item.setAlphabeticShortcut('a');
-            }
+            item = menu.add(0, MENU_AGENDA, 0, R.string.show_agenda_view);
+            item.setOnMenuItemClickListener(mContextMenuHandler);
+            item.setIcon(android.R.drawable.ic_menu_agenda);
+            item.setAlphabeticShortcut('a');
         }
 
         mPopup.dismiss();
@@ -2890,7 +2880,7 @@ public class CalendarView extends View
     private class ContextMenuHandler implements MenuItem.OnMenuItemClickListener {
         public boolean onMenuItemClick(MenuItem item) {
             switch (item.getItemId()) {
-                case MenuHelper.MENU_EVENT_VIEW: {
+                case MENU_EVENT_VIEW: {
                     if (mSelectedEvent != null) {
                         mController.sendEventRelatedEvent(this, EventType.VIEW_EVENT,
                                 mSelectedEvent.id, mSelectedEvent.startMillis,
@@ -2898,7 +2888,7 @@ public class CalendarView extends View
                     }
                     break;
                 }
-                case MenuHelper.MENU_EVENT_EDIT: {
+                case MENU_EVENT_EDIT: {
                     if (mSelectedEvent != null) {
                         mController.sendEventRelatedEvent(this, EventType.EDIT_EVENT,
                                 mSelectedEvent.id, mSelectedEvent.startMillis,
@@ -2906,24 +2896,24 @@ public class CalendarView extends View
                     }
                     break;
                 }
-                case MenuHelper.MENU_DAY: {
+                case MENU_DAY: {
                     mController.sendEvent(this, EventType.GO_TO, getSelectedTime(), null, -1,
                             ViewType.DAY);
                     break;
                 }
-                case MenuHelper.MENU_AGENDA: {
+                case MENU_AGENDA: {
                     mController.sendEvent(this, EventType.GO_TO, getSelectedTime(), null, -1,
                             ViewType.AGENDA);
                     break;
                 }
-                case MenuHelper.MENU_EVENT_CREATE: {
+                case MENU_EVENT_CREATE: {
                     long startMillis = getSelectedTimeInMillis();
                     long endMillis = startMillis + DateUtils.HOUR_IN_MILLIS;
                     mController.sendEventRelatedEvent(this, EventType.CREATE_EVENT, -1,
                             startMillis, endMillis, 0, 0);
                     break;
                 }
-                case MenuHelper.MENU_EVENT_DELETE: {
+                case MENU_EVENT_DELETE: {
                     if (mSelectedEvent != null) {
                         Event selectedEvent = mSelectedEvent;
                         long begin = selectedEvent.startMillis;
diff --git a/src/com/android/calendar/DayActivity.java b/src/com/android/calendar/DayActivity.java
deleted file mode 100644
index 29e33897..00000000
--- a/src/com/android/calendar/DayActivity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.calendar;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.os.Bundle;
-
-public class DayActivity extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        Fragment f = new DayFragment();
-        openFragmentTransaction().add(android.R.id.content, f).commit();
-    }
-}
diff --git a/src/com/android/calendar/DayFragment.java b/src/com/android/calendar/DayFragment.java
index 131d0e64..47e6a8fb 100644
--- a/src/com/android/calendar/DayFragment.java
+++ b/src/com/android/calendar/DayFragment.java
@@ -331,25 +331,4 @@ public class DayFragment extends Fragment implements CalendarController.EventHan
             goTo(msg.startTime, true);
         }
     }
-//    @Override
-//    public boolean onPrepareOptionsMenu(Menu menu) {
-//        MenuHelper.onPrepareOptionsMenu(this, menu);
-//        return super.onPrepareOptionsMenu(menu);
-//    }
-//
-//    @Override
-//    public boolean onCreateOptionsMenu(Menu menu) {
-//        if (! MenuHelper.onCreateOptionsMenu(menu)) {
-//            return false;
-//        }
-//        return super.onCreateOptionsMenu(menu);
-//    }
-//
-//    @Override
-//    public boolean onOptionsItemSelected(MenuItem item) {
-//        if (MenuHelper.onOptionsItemSelected(this, item, this)) {
-//            return true;
-//        }
-//        return super.onOptionsItemSelected(item);
-//    }
 }
diff --git a/src/com/android/calendar/DayView.java b/src/com/android/calendar/DayView.java
deleted file mode 100644
index 5cdfddbc..00000000
--- a/src/com/android/calendar/DayView.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.calendar;
-
-import android.content.Context;
-import android.widget.ViewSwitcher;
-
-
-public class DayView extends CalendarView {
-    private static final int CELL_MARGIN = 10;
-
-    public DayView(Context activity, CalendarController controller,
-            ViewSwitcher viewSwitcher, EventLoader eventLoader) {
-        super(activity, controller, viewSwitcher, eventLoader, 1);
-        init();
-    }
-
-    private void init() {
-        mDrawTextInEventRect = true;
-        mNumDays = 1;
-        mEventGeometry.setCellMargin(CELL_MARGIN);
-    }
-}
diff --git a/src/com/android/calendar/MenuHelper.java b/src/com/android/calendar/MenuHelper.java
deleted file mode 100644
index 74de96de..00000000
--- a/src/com/android/calendar/MenuHelper.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.calendar;
-
-import com.android.calendar.CalendarController.EventType;
-import com.android.calendar.CalendarController.ViewType;
-
-import android.app.Activity;
-import android.text.format.DateUtils;
-import android.text.format.Time;
-import android.view.Menu;
-import android.view.MenuItem;
-
-public class MenuHelper {
-    private static final int MENU_GROUP_AGENDA = 1;
-    private static final int MENU_GROUP_DAY = 2;
-    private static final int MENU_GROUP_WEEK = 3;
-    private static final int MENU_GROUP_MONTH = 4;
-    private static final int MENU_GROUP_EVENT_CREATE = 5;
-    private static final int MENU_GROUP_TODAY = 6;
-    private static final int MENU_GROUP_SELECT_CALENDARS = 7;
-    private static final int MENU_GROUP_PREFERENCES = 8;
-
-    public static final int MENU_GOTO_TODAY = 1;
-    public static final int MENU_AGENDA = 2;
-    public static final int MENU_DAY = 3;
-    public static final int MENU_WEEK = 4;
-    public static final int MENU_EVENT_VIEW = 5;
-    public static final int MENU_EVENT_CREATE = 6;
-    public static final int MENU_EVENT_EDIT = 7;
-    public static final int MENU_EVENT_DELETE = 8;
-    public static final int MENU_MONTH = 9;
-    public static final int MENU_SELECT_CALENDARS = 10;
-    public static final int MENU_PREFERENCES = 11;
-
-    public static void onPrepareOptionsMenu(Activity activity, Menu menu) {
-
-        if (activity instanceof AgendaActivity) {
-            menu.setGroupVisible(MENU_GROUP_AGENDA, true);
-            menu.setGroupEnabled(MENU_GROUP_AGENDA, false);
-        } else {
-            menu.setGroupVisible(MENU_GROUP_AGENDA, true);
-            menu.setGroupEnabled(MENU_GROUP_AGENDA, true);
-        }
-
-        if (activity instanceof DayActivity) {
-            menu.setGroupVisible(MENU_GROUP_DAY, true);
-            menu.setGroupEnabled(MENU_GROUP_DAY, false);
-        } else {
-            menu.setGroupVisible(MENU_GROUP_DAY, true);
-            menu.setGroupEnabled(MENU_GROUP_DAY, true);
-        }
-
-        if (activity instanceof WeekActivity) {
-            menu.setGroupVisible(MENU_GROUP_WEEK, true);
-            menu.setGroupEnabled(MENU_GROUP_WEEK, false);
-        } else {
-            menu.setGroupVisible(MENU_GROUP_WEEK, true);
-            menu.setGroupEnabled(MENU_GROUP_WEEK, true);
-        }
-
-        if (activity instanceof MonthActivity) {
-            menu.setGroupVisible(MENU_GROUP_MONTH, true);
-            menu.setGroupEnabled(MENU_GROUP_MONTH, false);
-        } else {
-            menu.setGroupVisible(MENU_GROUP_MONTH, true);
-            menu.setGroupEnabled(MENU_GROUP_MONTH, true);
-        }
-
-        if (activity instanceof EventInfoActivity) {
-            menu.setGroupVisible(MENU_GROUP_TODAY, false);
-            menu.setGroupEnabled(MENU_GROUP_TODAY, false);
-        } else {
-            menu.setGroupVisible(MENU_GROUP_TODAY, true);
-            menu.setGroupEnabled(MENU_GROUP_TODAY, true);
-        }
-    }
-
-    public static boolean onCreateOptionsMenu(Menu menu) {
-
-        MenuItem item;
-        item = menu.add(MENU_GROUP_DAY, MENU_DAY, 0, R.string.day_view);
-        item.setIcon(android.R.drawable.ic_menu_day);
-        item.setAlphabeticShortcut('d');
-
-        item = menu.add(MENU_GROUP_WEEK, MENU_WEEK, 0, R.string.week_view);
-        item.setIcon(android.R.drawable.ic_menu_week);
-        item.setAlphabeticShortcut('w');
-
-        item = menu.add(MENU_GROUP_MONTH, MENU_MONTH, 0, R.string.month_view);
-        item.setIcon(android.R.drawable.ic_menu_month);
-        item.setAlphabeticShortcut('m');
-
-        item = menu.add(MENU_GROUP_AGENDA, MENU_AGENDA, 0, R.string.agenda_view);
-        item.setIcon(android.R.drawable.ic_menu_agenda);
-        item.setAlphabeticShortcut('a');
-
-        item = menu.add(MENU_GROUP_TODAY, MENU_GOTO_TODAY, 0, R.string.goto_today);
-        item.setIcon(android.R.drawable.ic_menu_today);
-        item.setAlphabeticShortcut('t');
-
-        item = menu.add(MENU_GROUP_EVENT_CREATE, MENU_EVENT_CREATE, 0, R.string.event_create);
-        item.setIcon(android.R.drawable.ic_menu_add);
-        item.setAlphabeticShortcut('n');
-
-        item = menu.add(MENU_GROUP_SELECT_CALENDARS, MENU_SELECT_CALENDARS, 0,
-                R.string.menu_select_calendars);
-        item.setIcon(android.R.drawable.ic_menu_manage);
-
-        item = menu.add(MENU_GROUP_PREFERENCES, MENU_PREFERENCES, 0, R.string.menu_preferences);
-        item.setIcon(android.R.drawable.ic_menu_preferences);
-        item.setAlphabeticShortcut('p');
-
-        return true;
-    }
-
-    public static boolean onOptionsItemSelected(Activity activity, MenuItem item, Navigator nav) {
-        Time t;
-        switch (item.getItemId()) {
-            case MENU_SELECT_CALENDARS:
-                CalendarController.getInstance(activity).sendEvent(activity,
-                        EventType.LAUNCH_MANAGE_CALENDARS, null, null, 0, 0);
-                return true;
-            case MENU_GOTO_TODAY:
-                nav.goToToday();
-                return true;
-            case MENU_PREFERENCES:
-                CalendarController.getInstance(activity).sendEvent(activity,
-                        EventType.LAUNCH_SETTINGS, null, null, 0, 0);
-                return true;
-            case MENU_AGENDA:
-                // FRAG_TODO switch all to time or long?
-                t = new Time();
-                t.set(nav.getSelectedTime());
-                CalendarController.getInstance(activity).sendEvent(activity, EventType.GO_TO, t,
-                        null, -1, ViewType.AGENDA);
-                return true;
-            case MENU_DAY:
-                t = new Time();
-                t.set(nav.getSelectedTime());
-                CalendarController.getInstance(activity).sendEvent(activity, EventType.GO_TO, t,
-                        null, -1, ViewType.DAY);
-                return true;
-            case MENU_WEEK:
-                t = new Time();
-                t.set(nav.getSelectedTime());
-                CalendarController.getInstance(activity).sendEvent(activity, EventType.GO_TO, t,
-                        null, -1, ViewType.WEEK);
-                return true;
-            case MENU_MONTH:
-                t = new Time();
-                t.set(nav.getSelectedTime());
-                CalendarController.getInstance(activity).sendEvent(activity, EventType.GO_TO, t,
-                        null, -1, ViewType.MONTH);
-                return true;
-            case MENU_EVENT_CREATE: {
-                long startMillis = nav.getSelectedTime();
-                long endMillis = startMillis + DateUtils.HOUR_IN_MILLIS;
-                CalendarController.getInstance(activity).sendEventRelatedEvent(activity,
-                        EventType.CREATE_EVENT, -1, startMillis, endMillis, 0, 0);
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/src/com/android/calendar/Month/MiniMonthView.java b/src/com/android/calendar/Month/MiniMonthView.java
index 1f4f16d1..3c19bb6b 100644
--- a/src/com/android/calendar/Month/MiniMonthView.java
+++ b/src/com/android/calendar/Month/MiniMonthView.java
@@ -16,25 +16,17 @@
 
 package com.android.calendar.Month;
 
-import static android.provider.Calendar.EVENT_BEGIN_TIME;
-import static android.provider.Calendar.EVENT_END_TIME;
-
-import com.android.calendar.AgendaActivity;
 import com.android.calendar.CalendarController;
-import com.android.calendar.CalendarController.EventType;
-import com.android.calendar.CalendarController.ViewType;
-import com.android.calendar.DayActivity;
-import com.android.calendar.EditEventActivity;
 import com.android.calendar.Event;
 import com.android.calendar.EventGeometry;
 import com.android.calendar.EventLoader;
-import com.android.calendar.MenuHelper;
 import com.android.calendar.MonthFragment;
 import com.android.calendar.R;
 import com.android.calendar.Utils;
+import com.android.calendar.CalendarController.EventType;
+import com.android.calendar.CalendarController.ViewType;
 
 import android.content.Context;
-import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
@@ -42,10 +34,10 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.Paint.Style;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.Paint.Style;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.os.SystemClock;
@@ -54,7 +46,6 @@ import android.text.format.Time;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.GestureDetector;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -62,6 +53,7 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.PopupWindow;
 
 import java.util.ArrayList;
@@ -104,6 +96,10 @@ public class MiniMonthView extends View implements View.OnCreateContextMenuListe
     private static int DESIRED_CELL_HEIGHT = 40;
     private static int VERTICAL_FLING_THRESHOLD = 50;
 
+    private static final int MENU_AGENDA = 2;
+    private static final int MENU_DAY = 3;
+    private static final int MENU_EVENT_CREATE = 6;
+
     // The number of days worth of events to load
     private int mEventNumDays = 7 * (DEFAULT_NUM_WEEKS + 4);
     // Which day of the week the display starts on
@@ -539,17 +535,17 @@ public class MiniMonthView extends View implements View.OnCreateContextMenuListe
         final String title = DateUtils.formatDateTime(mContext, startMillis, flags);
         menu.setHeaderTitle(title);
 
-        item = menu.add(0, MenuHelper.MENU_DAY, 0, R.string.show_day_view);
+        item = menu.add(0, MENU_DAY, 0, R.string.show_day_view);
         item.setOnMenuItemClickListener(mContextMenuHandler);
         item.setIcon(android.R.drawable.ic_menu_day);
         item.setAlphabeticShortcut('d');
 
-        item = menu.add(0, MenuHelper.MENU_AGENDA, 0, R.string.show_agenda_view);
+        item = menu.add(0, MENU_AGENDA, 0, R.string.show_agenda_view);
         item.setOnMenuItemClickListener(mContextMenuHandler);
         item.setIcon(android.R.drawable.ic_menu_agenda);
         item.setAlphabeticShortcut('a');
 
-        item = menu.add(0, MenuHelper.MENU_EVENT_CREATE, 0, R.string.event_create);
+        item = menu.add(0, MENU_EVENT_CREATE, 0, R.string.event_create);
         item.setOnMenuItemClickListener(mContextMenuHandler);
         item.setIcon(android.R.drawable.ic_menu_add);
         item.setAlphabeticShortcut('n');
@@ -558,25 +554,21 @@ public class MiniMonthView extends View implements View.OnCreateContextMenuListe
     private class ContextMenuHandler implements MenuItem.OnMenuItemClickListener {
         public boolean onMenuItemClick(MenuItem item) {
             switch (item.getItemId()) {
-                case MenuHelper.MENU_DAY: {
-                    long startMillis = getSelectedTimeInMillis();
-                    Utils.startActivity(mContext, DayActivity.class.getName(), startMillis);
+                case MENU_DAY: {
+                    mController.sendEvent(this, EventType.GO_TO, mSelectedDay, null, -1,
+                            ViewType.DAY);
                     break;
                 }
-                case MenuHelper.MENU_AGENDA: {
-                    long startMillis = getSelectedTimeInMillis();
-                    Utils.startActivity(mContext, AgendaActivity.class.getName(),
-                            startMillis);
+                case MENU_AGENDA: {
+                    mController.sendEvent(this, EventType.GO_TO, mSelectedDay, null, -1,
+                            ViewType.AGENDA);
                     break;
                 }
-                case MenuHelper.MENU_EVENT_CREATE: {
+                case MENU_EVENT_CREATE: {
                     long startMillis = getSelectedTimeInMillis();
                     long endMillis = startMillis + DateUtils.HOUR_IN_MILLIS;
-                    Intent intent = new Intent(Intent.ACTION_VIEW);
-                    intent.setClassName(mContext, EditEventActivity.class.getName());
-                    intent.putExtra(EVENT_BEGIN_TIME, startMillis);
-                    intent.putExtra(EVENT_END_TIME, endMillis);
-                    mContext.startActivity(intent);
+                    mController.sendEventRelatedEvent(this, EventType.CREATE_EVENT, -1,
+                            startMillis, endMillis, 0, 0);
                     break;
                 }
                 default: {
diff --git a/src/com/android/calendar/MonthActivity.java b/src/com/android/calendar/MonthActivity.java
index 4ca44da7..c3544d6d 100644
--- a/src/com/android/calendar/MonthActivity.java
+++ b/src/com/android/calendar/MonthActivity.java
@@ -24,8 +24,6 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.text.format.Time;
-import android.view.Menu;
-import android.view.MenuItem;
 
 public class MonthActivity extends Activity {
     private static final int INITIAL_HEAP_SIZE = 4 * 1024 * 1024;
@@ -119,22 +117,4 @@ public class MonthActivity extends Activity {
 //FRAG_TODO        mContentResolver.registerContentObserver(Events.CONTENT_URI,
 //FRAG_TODO                true, mObserver);
     }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        MenuHelper.onPrepareOptionsMenu(this, menu);
-        return super.onPrepareOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuHelper.onCreateOptionsMenu(menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-//FRAG_TODO        MenuHelper.onOptionsItemSelected(this, item, this);
-        return super.onOptionsItemSelected(item);
-    }
 }
diff --git a/src/com/android/calendar/MonthView.java b/src/com/android/calendar/MonthView.java
index d2b7502e..dff0493d 100644
--- a/src/com/android/calendar/MonthView.java
+++ b/src/com/android/calendar/MonthView.java
@@ -75,6 +75,10 @@ public class MonthView extends View implements View.OnCreateContextMenuListener,
 
     private static int HORIZONTAL_FLING_THRESHOLD = 50;
 
+    private static final int MENU_AGENDA = 2;
+    private static final int MENU_DAY = 3;
+    private static final int MENU_EVENT_CREATE = 6;
+
     private int mCellHeight;
     private int mBorder;
     private boolean mLaunchDayView;
@@ -386,17 +390,17 @@ public class MonthView extends View implements View.OnCreateContextMenuListener,
         final String title = DateUtils.formatDateTime(mContext, startMillis, flags);
         menu.setHeaderTitle(title);
 
-        item = menu.add(0, MenuHelper.MENU_DAY, 0, R.string.show_day_view);
+        item = menu.add(0, MENU_DAY, 0, R.string.show_day_view);
         item.setOnMenuItemClickListener(mContextMenuHandler);
         item.setIcon(android.R.drawable.ic_menu_day);
         item.setAlphabeticShortcut('d');
 
-        item = menu.add(0, MenuHelper.MENU_AGENDA, 0, R.string.show_agenda_view);
+        item = menu.add(0, MENU_AGENDA, 0, R.string.show_agenda_view);
         item.setOnMenuItemClickListener(mContextMenuHandler);
         item.setIcon(android.R.drawable.ic_menu_agenda);
         item.setAlphabeticShortcut('a');
 
-        item = menu.add(0, MenuHelper.MENU_EVENT_CREATE, 0, R.string.event_create);
+        item = menu.add(0, MENU_EVENT_CREATE, 0, R.string.event_create);
         item.setOnMenuItemClickListener(mContextMenuHandler);
         item.setIcon(android.R.drawable.ic_menu_add);
         item.setAlphabeticShortcut('n');
@@ -405,17 +409,17 @@ public class MonthView extends View implements View.OnCreateContextMenuListener,
     private class ContextMenuHandler implements MenuItem.OnMenuItemClickListener {
         public boolean onMenuItemClick(MenuItem item) {
             switch (item.getItemId()) {
-                case MenuHelper.MENU_DAY: {
+                case MENU_DAY: {
                     mController.sendEvent(mContext, EventType.GO_TO, MonthView.this
                             .getSelectedTime(), null, -1, ViewType.DAY);
                     break;
                 }
-                case MenuHelper.MENU_AGENDA: {
+                case MENU_AGENDA: {
                     mController.sendEvent(mContext, EventType.GO_TO, MonthView.this
                             .getSelectedTime(), null, -1, ViewType.AGENDA);
                     break;
                 }
-                case MenuHelper.MENU_EVENT_CREATE: {
+                case MENU_EVENT_CREATE: {
                     long startMillis = getSelectedTimeInMillis();
                     long endMillis = startMillis + DateUtils.HOUR_IN_MILLIS;
                     mController.sendEventRelatedEvent(mContext, EventType.CREATE_EVENT, -1,
diff --git a/src/com/android/calendar/SearchActivity.java b/src/com/android/calendar/SearchActivity.java
index 244d9f00..0ff8e787 100644
--- a/src/com/android/calendar/SearchActivity.java
+++ b/src/com/android/calendar/SearchActivity.java
@@ -15,8 +15,8 @@
  */
 package com.android.calendar;
 
-import static android.provider.Calendar.EVENT_BEGIN_TIME;
 import dalvik.system.VMRuntime;
+
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.BroadcastReceiver;
@@ -32,8 +32,6 @@ import android.provider.Calendar.Events;
 import android.text.format.Time;
 import android.util.Log;
 import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
 
 /**
  */
@@ -193,24 +191,6 @@ public class SearchActivity extends Activity implements Navigator {
     }
 
     @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        MenuHelper.onPrepareOptionsMenu(this, menu);
-        return super.onPrepareOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuHelper.onCreateOptionsMenu(menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        MenuHelper.onOptionsItemSelected(this, item, this);
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         switch (keyCode) {
             case KeyEvent.KEYCODE_DEL:
diff --git a/src/com/android/calendar/WeekActivity.java b/src/com/android/calendar/WeekActivity.java
deleted file mode 100644
index 7650790e..00000000
--- a/src/com/android/calendar/WeekActivity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.calendar;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.os.Bundle;
-
-public class WeekActivity extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        Fragment f = new DayFragment();
-        openFragmentTransaction().add(android.R.id.content, f).commit();
-    }
-}
diff --git a/src/com/android/calendar/WeekView.java b/src/com/android/calendar/WeekView.java
deleted file mode 100644
index 808bcce8..00000000
--- a/src/com/android/calendar/WeekView.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.calendar;
-
-import android.content.Context;
-import android.widget.ViewSwitcher;
-
-
-public class WeekView extends CalendarView {
-    private static final int CELL_MARGIN = 0;
-
-    public WeekView(Context activity, CalendarController controller,
-            ViewSwitcher viewSwitcher, EventLoader eventLoader) {
-        super(activity, controller, viewSwitcher, eventLoader, 7);
-        init();
-    }
-
-    private void init() {
-        mDrawTextInEventRect = true;
-        mNumDays = 7;
-        mEventGeometry.setCellMargin(CELL_MARGIN);
-    }
-}