From 0e6a521747970d5427f10c25cdc070d2341dc93a Mon Sep 17 00:00:00 2001 From: Ben Komalo Date: Mon, 8 Aug 2011 14:39:19 -0700 Subject: [PATCH] Move IntentUtils to emailcommon. This is needed so Exchange can fire up Email activities. No change other than the move. Bug: 5122497 Change-Id: I6ee3f61654745fafd444314ecf75eb8ae6bbd01d --- .../src/com/android/emailcommon/utility}/IntentUtilities.java | 2 +- src/com/android/email/activity/EmailActivity.java | 1 + src/com/android/email/activity/Welcome.java | 1 + src/com/android/email/activity/setup/AccountSettings.java | 2 +- tests/src/com/android/email/activity/IntentUtilitiesTests.java | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) rename {src/com/android/email/activity => emailcommon/src/com/android/emailcommon/utility}/IntentUtilities.java (99%) diff --git a/src/com/android/email/activity/IntentUtilities.java b/emailcommon/src/com/android/emailcommon/utility/IntentUtilities.java similarity index 99% rename from src/com/android/email/activity/IntentUtilities.java rename to emailcommon/src/com/android/emailcommon/utility/IntentUtilities.java index f45f145f4..d38caad46 100644 --- a/src/com/android/email/activity/IntentUtilities.java +++ b/emailcommon/src/com/android/emailcommon/utility/IntentUtilities.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.activity; +package com.android.emailcommon.utility; import android.app.Activity; diff --git a/src/com/android/email/activity/EmailActivity.java b/src/com/android/email/activity/EmailActivity.java index 11359c0df..c3e4341cc 100644 --- a/src/com/android/email/activity/EmailActivity.java +++ b/src/com/android/email/activity/EmailActivity.java @@ -40,6 +40,7 @@ import com.android.emailcommon.provider.Account; import com.android.emailcommon.provider.EmailContent.Message; import com.android.emailcommon.provider.Mailbox; import com.android.emailcommon.utility.EmailAsyncTask; +import com.android.emailcommon.utility.IntentUtilities; import com.google.common.base.Preconditions; import java.util.ArrayList; diff --git a/src/com/android/email/activity/Welcome.java b/src/com/android/email/activity/Welcome.java index 5c9fe04e7..5a8d3266a 100644 --- a/src/com/android/email/activity/Welcome.java +++ b/src/com/android/email/activity/Welcome.java @@ -41,6 +41,7 @@ import com.android.emailcommon.provider.EmailContent; import com.android.emailcommon.provider.EmailContent.Message; import com.android.emailcommon.provider.Mailbox; import com.android.emailcommon.utility.EmailAsyncTask; +import com.android.emailcommon.utility.IntentUtilities; import com.android.emailcommon.utility.Utility; import com.google.common.annotations.VisibleForTesting; diff --git a/src/com/android/email/activity/setup/AccountSettings.java b/src/com/android/email/activity/setup/AccountSettings.java index f07f3b4a0..6b145bef3 100644 --- a/src/com/android/email/activity/setup/AccountSettings.java +++ b/src/com/android/email/activity/setup/AccountSettings.java @@ -39,12 +39,12 @@ import android.view.MenuItem; import com.android.email.Controller; import com.android.email.R; import com.android.email.activity.ActivityHelper; -import com.android.email.activity.IntentUtilities; import com.android.email.mail.Sender; import com.android.email.mail.Store; import com.android.emailcommon.Logging; import com.android.emailcommon.provider.Account; import com.android.emailcommon.provider.EmailContent.AccountColumns; +import com.android.emailcommon.utility.IntentUtilities; import com.android.emailcommon.utility.Utility; import java.util.List; diff --git a/tests/src/com/android/email/activity/IntentUtilitiesTests.java b/tests/src/com/android/email/activity/IntentUtilitiesTests.java index e68f31d85..f17ace6f5 100644 --- a/tests/src/com/android/email/activity/IntentUtilitiesTests.java +++ b/tests/src/com/android/email/activity/IntentUtilitiesTests.java @@ -16,7 +16,7 @@ package com.android.email.activity; -import com.android.email.activity.IntentUtilities; +import com.android.emailcommon.utility.IntentUtilities; import android.content.Intent; import android.net.Uri;