Moved alerts-related classes into a separate package

Change-Id: I2022efdbae9ceba6e6a0df35ade151c779cc8df7

AndroidManifest.xml

@@ -116,9 +116,11 @@
             <meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
         </activity>
 
-        <activity android:name="AlertActivity" android:launchMode="singleInstance"
+        <!-- Declarations for alerts/reminders -->
+        <activity android:name=".alerts.AlertActivity" android:launchMode="singleInstance"
              android:theme="@android:style/Theme.Light" android:excludeFromRecents="true" />
-        <receiver android:name="AlertReceiver">
+
+        <receiver android:name=".alerts.AlertReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.EVENT_REMINDER" />
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
@@ -128,9 +130,9 @@
             </intent-filter>
         </receiver>
 
-        <service android:name="AlertService" />
+        <service android:name=".alerts.AlertService" />
 
-        <service android:name="DismissAllAlarmsService" />
+        <service android:name=".alerts.DismissAllAlarmsService" />
 
         <!-- Declarations for the widget -->
         <receiver android:name=".widget.CalendarAppWidgetReceiver" android:enabled="false">

src/com/android/calendar/CalendarPreferenceActivity.java

@@ -37,31 +37,31 @@ public class CalendarPreferenceActivity extends PreferenceActivity implements On
     private static final String SHARED_PREFS_NAME = "com.android.calendar_preferences";
 
     // Preference keys
-    static final String KEY_HIDE_DECLINED = "preferences_hide_declined";
-    static final String KEY_WEEK_START_DAY = "preferences_week_start_day";
+    public static final String KEY_HIDE_DECLINED = "preferences_hide_declined";
+    public static final String KEY_WEEK_START_DAY = "preferences_week_start_day";
 
-    static final String KEY_ALERTS = "preferences_alerts";
-    static final String KEY_ALERTS_VIBRATE = "preferences_alerts_vibrate";
-    static final String KEY_ALERTS_VIBRATE_WHEN = "preferences_alerts_vibrateWhen";
-    static final String KEY_ALERTS_RINGTONE = "preferences_alerts_ringtone";
-    static final String KEY_ALERTS_POPUP = "preferences_alerts_popup";
+    public static final String KEY_ALERTS = "preferences_alerts";
+    public static final String KEY_ALERTS_VIBRATE = "preferences_alerts_vibrate";
+    public static final String KEY_ALERTS_VIBRATE_WHEN = "preferences_alerts_vibrateWhen";
+    public static final String KEY_ALERTS_RINGTONE = "preferences_alerts_ringtone";
+    public static final String KEY_ALERTS_POPUP = "preferences_alerts_popup";
 
-    static final String KEY_DEFAULT_REMINDER = "preferences_default_reminder";
+    public static final String KEY_DEFAULT_REMINDER = "preferences_default_reminder";
 
     /** Key to SharePreference for default view (CalendarController.ViewType) */
-    static final String KEY_START_VIEW = "preferred_startView";
+    public static final String KEY_START_VIEW = "preferred_startView";
     /**
      *  Key to SharePreference for default detail view (CalendarController.ViewType)
      *  Typically used by widget
      */
-    static final String KEY_DETAILED_VIEW = "preferred_detailedView";
-    static final String KEY_DEFAULT_CALENDAR = "preference_defaultCalendar";
+    public static final String KEY_DETAILED_VIEW = "preferred_detailedView";
+    public static final String KEY_DEFAULT_CALENDAR = "preference_defaultCalendar";
 
     // These must be in sync with the array preferences_week_start_day_values
-    static final String WEEK_START_DEFAULT = "-1";
-    static final String WEEK_START_SATURDAY = "7";
-    static final String WEEK_START_SUNDAY = "1";
-    static final String WEEK_START_MONDAY = "2";
+    public static final String WEEK_START_DEFAULT = "-1";
+    public static final String WEEK_START_SATURDAY = "7";
+    public static final String WEEK_START_SUNDAY = "1";
+    public static final String WEEK_START_MONDAY = "2";
 
     // These keys are kept to enable migrating users from previous versions
     private static final String KEY_ALERTS_TYPE = "preferences_alerts_type";

src/com/android/calendar/AlertActivity.java → src/com/android/calendar/alerts/AlertActivity.java

@@ -14,9 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.calendar;
+package com.android.calendar.alerts;
 
+import com.android.calendar.AsyncQueryService;
+import com.android.calendar.CalendarController;
 import com.android.calendar.CalendarController.EventType;
+import com.android.calendar.R;
+import com.android.calendar.R.id;
+import com.android.calendar.R.layout;
+import com.android.calendar.R.string;
+import com.android.calendar.Utils;
 
 import android.app.Activity;
 import android.app.AlarmManager;

src/com/android/calendar/AlertAdapter.java → src/com/android/calendar/alerts/AlertAdapter.java

@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.calendar;
+package com.android.calendar.alerts;
+
+import com.android.calendar.R;
+import com.android.calendar.R.id;
+import com.android.calendar.R.string;
 
 import android.content.Context;
 import android.content.res.Resources;

src/com/android/calendar/AlertReceiver.java → src/com/android/calendar/alerts/AlertReceiver.java

@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.calendar;
+package com.android.calendar.alerts;
+
+import com.android.calendar.R;
+import com.android.calendar.R.drawable;
+import com.android.calendar.R.string;
 
 import android.app.Notification;
 import android.app.PendingIntent;

src/com/android/calendar/AlertService.java → src/com/android/calendar/alerts/AlertService.java

@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.calendar;
+package com.android.calendar.alerts;
+
+import com.android.calendar.CalendarPreferenceActivity;
+import com.android.calendar.R;
+import com.android.calendar.R.string;
 
 import android.app.AlarmManager;
 import android.app.Notification;

src/com/android/calendar/DismissAllAlarmsService.java → src/com/android/calendar/alerts/DismissAllAlarmsService.java

@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.calendar;
+package com.android.calendar.alerts;
 
 import android.app.IntentService;
 import android.content.ContentResolver;