Move non-exchange specific classes to com.android.email.service.

Android.mk

@@ -19,8 +19,8 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_SRC_FILES += \
-    src/com/android/exchange/IEmailService.aidl \
-    src/com/android/exchange/IEmailServiceCallback.aidl
+    src/com/android/email/service/IEmailService.aidl \
+    src/com/android/email/service/IEmailServiceCallback.aidl
 
 
 LOCAL_PACKAGE_NAME := Email

src/com/android/email/Controller.java

@@ -28,9 +28,9 @@ import com.android.email.provider.EmailContent.MailboxColumns;
 import com.android.email.provider.EmailContent.Message;
 import com.android.email.provider.EmailContent.MessageColumns;
 import com.android.email.service.EmailServiceProxy;
-import com.android.exchange.EmailServiceStatus;
-import com.android.exchange.IEmailService;
-import com.android.exchange.IEmailServiceCallback;
+import com.android.email.service.EmailServiceStatus;
+import com.android.email.service.IEmailService;
+import com.android.email.service.IEmailServiceCallback;
 import com.android.exchange.SyncManager;
 
 import android.content.ContentResolver;

src/com/android/email/activity/MessageView.java

@@ -31,7 +31,7 @@ import com.android.email.provider.EmailContent.Attachment;
 import com.android.email.provider.EmailContent.Body;
 import com.android.email.provider.EmailContent.BodyColumns;
 import com.android.email.provider.EmailContent.Message;
-import com.android.exchange.EmailServiceConstants;
+import com.android.email.service.EmailServiceConstants;
 
 import org.apache.commons.io.IOUtils;
 

src/com/android/email/service/EmailServiceConstants.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.exchange;
+package com.android.email.service;
 
 public class EmailServiceConstants {
     public static final int MEETING_REQUEST_ACCEPTED = 1;

src/com/android/email/service/EmailServiceProxy.java

@@ -17,8 +17,6 @@
 package com.android.email.service;
 
 import com.android.email.mail.MessagingException;
-import com.android.exchange.IEmailService;
-import com.android.exchange.IEmailServiceCallback;
 
 import android.content.ComponentName;
 import android.content.Context;

src/com/android/email/service/EmailServiceStatus.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.exchange;
+package com.android.email.service;
 
 /**
  * Definitions of service status codes returned to IEmailServiceCallback's status method

src/com/android/email/service/IEmailService.aidl

@@ -14,10 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.exchange;
+package com.android.email.service;
 
-import com.android.exchange.IEmailServiceCallback;
-import com.android.email.provider.EmailContent;
+import com.android.email.service.IEmailServiceCallback;
 import android.os.Bundle;
 
 interface IEmailService {

src/com/android/email/service/IEmailServiceCallback.aidl

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.exchange;
+package com.android.email.service;
 
 oneway interface IEmailServiceCallback {
     /*

src/com/android/exchange/EasOutboxService.java

@@ -26,6 +26,7 @@ import com.android.email.provider.EmailContent.MailboxColumns;
 import com.android.email.provider.EmailContent.Message;
 import com.android.email.provider.EmailContent.MessageColumns;
 import com.android.email.provider.EmailContent.SyncColumns;
+import com.android.email.service.EmailServiceStatus;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;

src/com/android/exchange/EasSyncService.java

@@ -29,6 +29,7 @@ import com.android.email.provider.EmailContent.Mailbox;
 import com.android.email.provider.EmailContent.MailboxColumns;
 import com.android.email.provider.EmailContent.Message;
 import com.android.email.service.EmailServiceProxy;
+import com.android.email.service.EmailServiceStatus;
 import com.android.exchange.adapter.AbstractSyncAdapter;
 import com.android.exchange.adapter.AccountSyncAdapter;
 import com.android.exchange.adapter.CalendarSyncAdapter;

src/com/android/exchange/SyncManager.java

@@ -29,6 +29,8 @@ import com.android.email.provider.EmailContent.Mailbox;
 import com.android.email.provider.EmailContent.MailboxColumns;
 import com.android.email.provider.EmailContent.Message;
 import com.android.email.provider.EmailContent.SyncColumns;
+import com.android.email.service.IEmailService;
+import com.android.email.service.IEmailServiceCallback;
 import com.android.exchange.utility.FileLogger;
 
 import org.apache.http.conn.ClientConnectionManager;