Merge "AOSP/Calendar - Fix the crash bug. Deleted a code fragment that remained that was selecting and viewing of the calendar events.."

3 files changed, 2 insertions, 114 deletions

diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index d7780379..cec6a40f 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -930,7 +930,7 @@ public class AllInOneActivity extends Activity implements EventHandler,
 
     @Override
     public long getSupportedEventTypes() {
-        return EventType.GO_TO | EventType.VIEW_EVENT | EventType.UPDATE_TITLE;
+        return EventType.GO_TO | EventType.UPDATE_TITLE;
     }
 
     @Override
@@ -991,52 +991,6 @@ public class AllInOneActivity extends Activity implements EventHandler,
             if (!mIsTabletConfig) {
                 mActionBarMenuSpinnerAdapter.setTime(displayTime);
             }
-        } else if (event.eventType == EventType.VIEW_EVENT) {
-
-            // If in Agenda view and "show_event_details_with_agenda" is "true",
-            // do not create the event info fragment here, it will be created by the Agenda
-            // fragment
-
-            if (mCurrentView != ViewType.AGENDA) {
-                // TODO Fix the temp hack below: && mCurrentView !=
-                // ViewType.AGENDA
-                if (event.selectedTime != null) {
-                    mController.sendEvent(this, EventType.GO_TO, event.selectedTime,
-                            event.selectedTime, -1, ViewType.CURRENT);
-                }
-                int response = event.getResponse();
-                if (((mCurrentView == ViewType.DAY || (mCurrentView == ViewType.WEEK) ||
-                                mCurrentView == ViewType.MONTH) && mShowEventInfoFullScreen)){
-                    // start event info as activity
-                    Intent intent = new Intent(Intent.ACTION_VIEW);
-                    Uri eventUri = ContentUris.withAppendedId(Events.CONTENT_URI, event.id);
-                    intent.setData(eventUri);
-                    intent.setClass(this, EventInfoActivity.class);
-                    intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT |
-                            Intent.FLAG_ACTIVITY_SINGLE_TOP);
-                    intent.putExtra(EXTRA_EVENT_BEGIN_TIME, event.startTime.toMillis(false));
-                    intent.putExtra(EXTRA_EVENT_END_TIME, event.endTime.toMillis(false));
-                    intent.putExtra(ATTENDEE_STATUS, response);
-                    startActivity(intent);
-                } else {
-                    // start event info as a dialog
-                    EventInfoFragment fragment = new EventInfoFragment(this,
-                            event.id, event.startTime.toMillis(false),
-                            event.endTime.toMillis(false), response, true,
-                            EventInfoFragment.DIALOG_WINDOW_STYLE);
-                    fragment.setDialogParams(event.x, event.y, mActionBar.getHeight());
-                    FragmentManager fm = getFragmentManager();
-                    FragmentTransaction ft = fm.beginTransaction();
-                    // if we have an old popup replace it
-                    Fragment fOld = fm.findFragmentByTag(EVENT_INFO_FRAGMENT_TAG);
-                    if (fOld != null && fOld.isAdded()) {
-                        ft.remove(fOld);
-                    }
-                    ft.add(fragment, EVENT_INFO_FRAGMENT_TAG);
-                    ft.commit();
-                }
-            }
-            displayTime = event.startTime.toMillis(true);
         } else if (event.eventType == EventType.UPDATE_TITLE) {
             setTitleInActionBar(event);
             if (!mIsTabletConfig) {
diff --git a/src/com/android/calendar/DayFragment.java b/src/com/android/calendar/DayFragment.java
index 8999141d..a9fb39ed 100644
--- a/src/com/android/calendar/DayFragment.java
+++ b/src/com/android/calendar/DayFragment.java
@@ -234,21 +234,6 @@ public class DayFragment extends Fragment implements CalendarController.EventHan
         view.clearCachedEvents();
     }
 
-    Event getSelectedEvent() {
-        DayView view = (DayView) mViewSwitcher.getCurrentView();
-        return view.getSelectedEvent();
-    }
-
-    boolean isEventSelected() {
-        DayView view = (DayView) mViewSwitcher.getCurrentView();
-        return view.isEventSelected();
-    }
-
-    Event getNewEvent() {
-        DayView view = (DayView) mViewSwitcher.getCurrentView();
-        return view.getNewEvent();
-    }
-
     public DayView getNextView() {
         return (DayView) mViewSwitcher.getNextView();
     }
diff --git a/src/com/android/calendar/DayView.java b/src/com/android/calendar/DayView.java
index c9f3093d..2fc00b3c 100644
--- a/src/com/android/calendar/DayView.java
+++ b/src/com/android/calendar/DayView.java
@@ -438,8 +438,6 @@ public class DayView extends View implements View.OnCreateContextMenuListener,
     private static int EVENT_LINE_PADDING = 4;
     private static int NEW_EVENT_HINT_FONT_SIZE = 12;
 
-    private static int mPressedColor;
-    private static int mClickedColor;
     private static int mEventTextColor;
     private static int mMoreEventsTextColor;
 
@@ -799,8 +797,6 @@ public class DayView extends View implements View.OnCreateContextMenuListener,
         mCalendarGridLineInnerVerticalColor = mResources
                 .getColor(R.color.calendar_grid_line_inner_vertical_color);
         mCalendarHourLabelColor = mResources.getColor(R.color.calendar_hour_label);
-        mPressedColor = mResources.getColor(R.color.pressed);
-        mClickedColor = mResources.getColor(R.color.day_event_clicked_background_color);
         mEventTextColor = mResources.getColor(R.color.calendar_event_text_color);
         mMoreEventsTextColor = mResources.getColor(R.color.month_event_other_color);
 
@@ -2380,36 +2376,6 @@ public class DayView extends View implements View.OnCreateContextMenuListener,
         p.setAntiAlias(true);
     }
 
-    Event getSelectedEvent() {
-        if (mSelectedEvent == null) {
-            // There is no event at the selected hour, so create a new event.
-            return getNewEvent(mSelectionDay, getSelectedTimeInMillis(),
-                    getSelectedMinutesSinceMidnight());
-        }
-        return mSelectedEvent;
-    }
-
-    boolean isEventSelected() {
-        return (mSelectedEvent != null);
-    }
-
-    Event getNewEvent() {
-        return getNewEvent(mSelectionDay, getSelectedTimeInMillis(),
-                getSelectedMinutesSinceMidnight());
-    }
-
-    static Event getNewEvent(int julianDay, long utcMillis,
-            int minutesSinceMidnight) {
-        Event event = Event.newInstance();
-        event.startDay = julianDay;
-        event.endDay = julianDay;
-        event.startMillis = utcMillis;
-        event.endMillis = event.startMillis + MILLIS_PER_HOUR;
-        event.startTime = minutesSinceMidnight;
-        event.endTime = event.startTime + MINUTES_PER_HOUR;
-        return event;
-    }
-
     private int computeMaxStringWidth(int currentMax, String[] strings, Paint p) {
         float maxWidthF = 0.0f;
 
@@ -2815,13 +2781,7 @@ public class DayView extends View implements View.OnCreateContextMenuListener,
         r.left = (int) event.left + EVENT_RECT_LEFT_MARGIN;
         r.right = (int) event.right;
 
-        int color;
-        if (event == mClickedEvent) {
-                color = mClickedColor;
-        } else {
-            color = event.color;
-        }
-
+        int color = event.color;
         switch (event.selfAttendeeStatus) {
             case Attendees.ATTENDEE_STATUS_INVITED:
                 if (event != mClickedEvent) {
@@ -2857,17 +2817,6 @@ public class DayView extends View implements View.OnCreateContextMenuListener,
         p.setAlpha(alpha);
         p.setStyle(Style.FILL);
 
-        // If this event is selected, then use the selection color
-        if (mSelectedEvent == event && mClickedEvent != null) {
-            boolean paintIt = false;
-            color = 0;
-            if (paintIt) {
-                p.setColor(color);
-                canvas.drawRect(r, p);
-            }
-            p.setAntiAlias(true);
-        }
-
         // Setup rect for drawEventText which follows
         r.top = (int) event.top + EVENT_RECT_TOP_MARGIN;
         r.bottom = (int) event.bottom - EVENT_RECT_BOTTOM_MARGIN;