Implemented a search activity, two pane results layout

 - The new search activity uses its own instance of CalendarController
 - Some modifications to the event info fragment were necessary
 - Activity title is still being set erroneously by the fragment

Change-Id: Ib2810a3330f9272ed824d5341abd49bb7a842772

1 files changed, 69 insertions, 2 deletions

diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java
index 85eed2cb..5ab8d29f 100644
--- a/src/com/android/calendar/EventInfoActivity.java
+++ b/src/com/android/calendar/EventInfoActivity.java
@@ -20,18 +20,32 @@ package com.android.calendar;
 import static android.provider.Calendar.EVENT_BEGIN_TIME;
 import static android.provider.Calendar.EVENT_END_TIME;
 import static android.provider.Calendar.AttendeesColumns.ATTENDEE_STATUS;
+
+import com.android.calendar.CalendarController.EventInfo;
+import com.android.calendar.CalendarController.EventType;
+
 import android.app.Fragment;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.format.Time;
+
+public class EventInfoActivity extends AbstractCalendarActivity
+        implements CalendarController.EventHandler {
 
-public class EventInfoActivity extends AbstractCalendarActivity {
+    private static final int HANDLER_KEY = 0;
 
-    private static final int ATTENDEE_NO_RESPONSE = -1;
+    static final int ATTENDEE_NO_RESPONSE = -1;
+
+    private DeleteEventHelper mDeleteEventHelper;
+    private CalendarController mController;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        // This needs to be created before setContentView
+        mController = CalendarController.getInstance(this);
+
         Intent intent = getIntent();
         Uri uri = intent.getData();
         long startMillis = intent.getLongExtra(EVENT_BEGIN_TIME, 0);
@@ -39,6 +53,59 @@ public class EventInfoActivity extends AbstractCalendarActivity {
         int attendeeResponseFromIntent = intent.getIntExtra(ATTENDEE_STATUS, ATTENDEE_NO_RESPONSE);
         Fragment f = new EventInfoFragment(uri, startMillis, endMillis, attendeeResponseFromIntent);
         openFragmentTransaction().add(android.R.id.content, f).commit();
+
+        mDeleteEventHelper = new DeleteEventHelper(this, this, true /* exit when done */);
+        mController.registerEventHandler(HANDLER_KEY, this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        CalendarController.removeInstance(this);
+    }
+
+    @Override
+    public void eventsChanged() {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public boolean getAllDay() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public long getSelectedTime() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public long getSupportedEventTypes() {
+        return EventType.DELETE_EVENT;
+    }
+
+    @Override
+    public void goTo(Time time, boolean animate) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void goToToday() {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void handleEvent(EventInfo event) {
+        if (event.eventType == EventType.DELETE_EVENT) {
+            long endTime = (event.endTime == null) ? -1 : event.endTime.toMillis(false);
+            mDeleteEventHelper.delete(
+                    event.startTime.toMillis(false), endTime, event.id, -1);
+        }
     }
 
 }