Moved agenda-related classes into an agenda package

Change-Id: If834a652490938b4a31bfd5f6fa4e1aea2a6ffa7

10 files changed, 38 insertions, 31 deletions

diff --git a/res/layout/agenda_item.xml b/res/layout/agenda_item.xml
index d650f1e0..b8ade61f 100644
--- a/res/layout/agenda_item.xml
+++ b/res/layout/agenda_item.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.calendar.AgendaItemView
+<com.android.calendar.agenda.AgendaItemView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/content"
     android:layout_height="wrap_content"
@@ -57,4 +57,4 @@
         android:textColor="?android:attr/textColorSecondary"
         style="?android:attr/textAppearanceSmallInverse" />
 
-</com.android.calendar.AgendaItemView>
+</com.android.calendar.agenda.AgendaItemView>
diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index b9f30460..b5eb991a 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -20,6 +20,7 @@ import com.android.calendar.CalendarController.EventHandler;
 import com.android.calendar.CalendarController.EventInfo;
 import com.android.calendar.CalendarController.EventType;
 import com.android.calendar.CalendarController.ViewType;
+import com.android.calendar.agenda.AgendaFragment;
 import com.android.calendar.selectcalendars.SelectCalendarsFragment;
 
 import android.app.ActionBar;
diff --git a/src/com/android/calendar/CalendarController.java b/src/com/android/calendar/CalendarController.java
index cd0d6e7d..b80ccaa5 100644
--- a/src/com/android/calendar/CalendarController.java
+++ b/src/com/android/calendar/CalendarController.java
@@ -103,15 +103,15 @@ public class CalendarController {
     }
 
     public static class EventInfo {
-        long eventType; // one of the EventType
-        int viewType; // one of the ViewType
-        long id; // event id
-        Time selectedTime; // the selected time in focus
-        Time startTime; // start of a range of time.
-        Time endTime; // end of a range of time.
-        int x; // x coordinate in the activity space
-        int y; // y coordinate in the activity space
-        String query; // query for a user search
+        public long eventType; // one of the EventType
+        public int viewType; // one of the ViewType
+        public long id; // event id
+        public Time selectedTime; // the selected time in focus
+        public Time startTime; // start of a range of time.
+        public Time endTime; // end of a range of time.
+        public int x; // x coordinate in the activity space
+        public int y; // y coordinate in the activity space
+        public String query; // query for a user search
     }
 
     // FRAG_TODO remove unneeded api's
diff --git a/src/com/android/calendar/SearchActivity.java b/src/com/android/calendar/SearchActivity.java
index 4239739d..0fdfca2c 100644
--- a/src/com/android/calendar/SearchActivity.java
+++ b/src/com/android/calendar/SearchActivity.java
@@ -21,6 +21,7 @@ import static android.provider.Calendar.EVENT_END_TIME;
 import com.android.calendar.CalendarController.EventInfo;
 import com.android.calendar.CalendarController.EventType;
 import com.android.calendar.CalendarController.ViewType;
+import com.android.calendar.agenda.AgendaFragment;
 
 import dalvik.system.VMRuntime;
 
diff --git a/src/com/android/calendar/AgendaAdapter.java b/src/com/android/calendar/agenda/AgendaAdapter.java
index 9df12012..972b1c52 100644
--- a/src/com/android/calendar/AgendaAdapter.java
+++ b/src/com/android/calendar/agenda/AgendaAdapter.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.calendar;
+package com.android.calendar.agenda;
+
+import com.android.calendar.R;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/src/com/android/calendar/AgendaByDayAdapter.java b/src/com/android/calendar/agenda/AgendaByDayAdapter.java
index f7b86de5..cf2ca5c3 100644
--- a/src/com/android/calendar/AgendaByDayAdapter.java
+++ b/src/com/android/calendar/agenda/AgendaByDayAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.calendar;
+package com.android.calendar.agenda;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -26,7 +26,8 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.android.calendar.AgendaWindowAdapter.DayAdapterInfo;
+import com.android.calendar.agenda.AgendaWindowAdapter.DayAdapterInfo;
+import com.android.calendar.R;
 
 import java.util.ArrayList;
 import java.util.Formatter;
diff --git a/src/com/android/calendar/AgendaFragment.java b/src/com/android/calendar/agenda/AgendaFragment.java
index 40d8a285..a3db52fb 100644
--- a/src/com/android/calendar/AgendaFragment.java
+++ b/src/com/android/calendar/agenda/AgendaFragment.java
@@ -14,28 +14,25 @@
  * limitations under the License.
  */
 
-package com.android.calendar;
-
-import com.android.calendar.CalendarController.EventInfo;
-import com.android.calendar.CalendarController.EventType;
-
-import dalvik.system.VMRuntime;
+package com.android.calendar.agenda;
 
 import android.app.Fragment;
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
-import android.database.ContentObserver;
 import android.os.Bundle;
-import android.os.Handler;
 import android.text.format.Time;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.android.calendar.CalendarController;
+import com.android.calendar.CalendarController.EventInfo;
+import com.android.calendar.CalendarController.EventType;
+import com.android.calendar.CalendarPreferenceActivity;
+
+import dalvik.system.VMRuntime;
+
 public class AgendaFragment extends Fragment implements CalendarController.EventHandler {
 
     private static final String TAG = AgendaFragment.class.getSimpleName();
diff --git a/src/com/android/calendar/AgendaItemView.java b/src/com/android/calendar/agenda/AgendaItemView.java
index 7419e1ad..9f314ea4 100644
--- a/src/com/android/calendar/AgendaItemView.java
+++ b/src/com/android/calendar/agenda/AgendaItemView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.calendar;
+package com.android.calendar.agenda;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -22,7 +22,7 @@ import android.graphics.Paint;
 import android.util.AttributeSet;
 import android.widget.RelativeLayout;
 
-import com.android.calendar.AgendaAdapter.ViewHolder;
+import com.android.calendar.agenda.AgendaAdapter.ViewHolder;
 
 /**
  * A custom layout for each item in the Agenda list view.
diff --git a/src/com/android/calendar/AgendaListView.java b/src/com/android/calendar/agenda/AgendaListView.java
index 884a3fc0..ebf756f2 100644
--- a/src/com/android/calendar/AgendaListView.java
+++ b/src/com/android/calendar/agenda/AgendaListView.java
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.calendar;
+package com.android.calendar.agenda;
 
-import com.android.calendar.AgendaAdapter.ViewHolder;
-import com.android.calendar.AgendaWindowAdapter.EventInfo;
+import com.android.calendar.CalendarController;
 import com.android.calendar.CalendarController.EventType;
+import com.android.calendar.DeleteEventHelper;
+import com.android.calendar.agenda.AgendaAdapter.ViewHolder;
+import com.android.calendar.agenda.AgendaWindowAdapter.EventInfo;
 
 import android.content.Context;
 import android.graphics.Rect;
diff --git a/src/com/android/calendar/AgendaWindowAdapter.java b/src/com/android/calendar/agenda/AgendaWindowAdapter.java
index ce9c29ee..540e1753 100644
--- a/src/com/android/calendar/AgendaWindowAdapter.java
+++ b/src/com/android/calendar/agenda/AgendaWindowAdapter.java
@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.calendar;
+package com.android.calendar.agenda;
+
+import com.android.calendar.R;
+import com.android.calendar.Utils;
 
 import android.content.AsyncQueryHandler;
 import android.content.ContentResolver;