rename unified email's package name to com.android.mail
New code needs a new package name. Fixes IDE conflicts when
browsing.
Change-Id: I328484c6d6c71df077a05d2f7d6d1e85074107c2
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0eb4a6d..3aadc3b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.email"
+ package="com.android.mail"
android:versionCode="1"
android:versionName="1.0" >
@@ -70,7 +70,7 @@
<receiver android:name=".providers.protos.gmail.GmailIntentReceiver">
<intent-filter>
- <action android:name="com.android.email.providers.protos.gmail.intent.ACTION_PROVIDER_CREATED" />
+ <action android:name="com.android.mail.providers.protos.gmail.intent.ACTION_PROVIDER_CREATED" />
</intent-filter>
</receiver>
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 5808b42..f663aae 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -47,4 +47,5 @@
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/UnifiedEmail_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/UnifiedEmail_intermediates)
\ No newline at end of file
diff --git a/proguard.flags b/proguard.flags
index a9a19d6..38fa05a 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -7,15 +7,15 @@
# keep names that are used by reflection, from javascript or from unit tests
--keepclasseswithmembers class com.android.email.providers.MockUiProvider {
+-keepclasseswithmembers class com.android.mail.providers.MockUiProvider {
*** getAccountsUri(...);
}
--keepclasseswithmembers class com.android.email.providers.UIProvider {
+-keepclasseswithmembers class com.android.mail.providers.UIProvider {
*** getAccountsUri(...);
}
--keepclasseswithmembers class com.android.email.utils.LogUtils {
+-keepclasseswithmembers class com.android.mail.utils.LogUtils {
public <methods>;
}
@@ -24,6 +24,6 @@
*** of(...);
}
--keepclasseswithmembers class com.android.email.UnifiedEmail {
+-keepclasseswithmembers class com.android.mail.UnifiedEmail {
public <methods>;
}
diff --git a/res/layout/actionbar_subject.xml b/res/layout/actionbar_subject.xml
index e142485..652b00f 100644
--- a/res/layout/actionbar_subject.xml
+++ b/res/layout/actionbar_subject.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<com.android.email.browse.SnippetTextView
+<com.android.mail.browse.SnippetTextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/conversation_subject"
android:layout_width="match_parent"
diff --git a/res/layout/actionbar_view.xml b/res/layout/actionbar_view.xml
index dba2ab1..ffaa03b 100644
--- a/res/layout/actionbar_view.xml
+++ b/res/layout/actionbar_view.xml
@@ -20,13 +20,13 @@
The custom action bar view Gmail uses (containing drop down account spinner,
label, and subject).
-->
-<com.android.email.MailActionBar xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:email="http://schemas.android.com/apk/res/com.android.email"
+<com.android.mail.MailActionBar xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:email="http://schemas.android.com/apk/res/com.android.mail"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" >
- <com.android.email.AccountRecentLabelSpinner
+ <com.android.mail.AccountRecentLabelSpinner
android:id="@+id/account_spinner"
android:layout_width="match_parent"
android:layout_height="match_parent" />
@@ -36,4 +36,4 @@
<include layout="@layout/actionbar_subject" />
-</com.android.email.MailActionBar>
+</com.android.mail.MailActionBar>
diff --git a/res/layout/compose.xml b/res/layout/compose.xml
index 91c853b..5a0f2fe 100644
--- a/res/layout/compose.xml
+++ b/res/layout/compose.xml
@@ -49,7 +49,7 @@
</LinearLayout>
<!-- Attachments -->
- <com.android.email.compose.AttachmentsView android:id="@+id/attachments"
+ <com.android.mail.compose.AttachmentsView android:id="@+id/attachments"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical"
@@ -62,7 +62,7 @@
<include layout="@layout/compose_body"/>
<!-- Quoted text -->
- <com.android.email.compose.QuotedTextView android:id="@+id/quoted_text_view"
+ <com.android.mail.compose.QuotedTextView android:id="@+id/quoted_text_view"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
diff --git a/res/layout/compose_recipients.xml b/res/layout/compose_recipients.xml
index ce8a852..04e5ea9 100644
--- a/res/layout/compose_recipients.xml
+++ b/res/layout/compose_recipients.xml
@@ -45,7 +45,7 @@
</LinearLayout>
- <com.android.email.compose.CcBccView
+ <com.android.mail.compose.CcBccView
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:id="@+id/cc_bcc_wrapper"
diff --git a/res/layout/conversation_message_header.xml b/res/layout/conversation_message_header.xml
index 6b0207f..dcb370b 100644
--- a/res/layout/conversation_message_header.xml
+++ b/res/layout/conversation_message_header.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.email.browse.MessageHeaderView
+<com.android.mail.browse.MessageHeaderView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -27,4 +27,4 @@
<include layout="@layout/conversation_message_upper_header"
android:id="@+id/upper_header" />
-</com.android.email.browse.MessageHeaderView>
+</com.android.mail.browse.MessageHeaderView>
diff --git a/src/com/android/email/AccountRecentLabelSpinner.java b/src/com/android/mail/AccountRecentLabelSpinner.java
similarity index 96%
rename from src/com/android/email/AccountRecentLabelSpinner.java
rename to src/com/android/mail/AccountRecentLabelSpinner.java
index e297d4e..c4cf3af 100644
--- a/src/com/android/email/AccountRecentLabelSpinner.java
+++ b/src/com/android/mail/AccountRecentLabelSpinner.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
import android.content.Context;
import android.util.AttributeSet;
import android.view.View;
import android.widget.TextView;
-import com.android.email.browse.MultiAdapterSpinner;
+import com.android.mail.browse.MultiAdapterSpinner;
/**
* A spinner among accounts that also displays shortcuts to recently used labels for the current
diff --git a/src/com/android/email/AccountSpinnerAdapter.java b/src/com/android/mail/AccountSpinnerAdapter.java
similarity index 99%
rename from src/com/android/email/AccountSpinnerAdapter.java
rename to src/com/android/mail/AccountSpinnerAdapter.java
index 32a1bb5..018b8fb 100644
--- a/src/com/android/email/AccountSpinnerAdapter.java
+++ b/src/com/android/mail/AccountSpinnerAdapter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
import android.content.Context;
import android.database.DataSetObserver;
diff --git a/src/com/android/email/ActionBarView.java b/src/com/android/mail/ActionBarView.java
similarity index 99%
rename from src/com/android/email/ActionBarView.java
rename to src/com/android/mail/ActionBarView.java
index 4af4ac5..46f1741 100644
--- a/src/com/android/email/ActionBarView.java
+++ b/src/com/android/mail/ActionBarView.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
import android.app.ActionBar;
import android.os.Bundle;
diff --git a/src/com/android/email/ContactInfoSource.java b/src/com/android/mail/ContactInfoSource.java
similarity index 91%
rename from src/com/android/email/ContactInfoSource.java
rename to src/com/android/mail/ContactInfoSource.java
index d096eff..717b8e5 100644
--- a/src/com/android/email/ContactInfoSource.java
+++ b/src/com/android/mail/ContactInfoSource.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
-import com.android.email.SenderInfoLoader.ContactInfo;
+import com.android.mail.SenderInfoLoader.ContactInfo;
/**
* Views that are interested in looking up ContactInfo objects should bind themselves to a
* ContactInfoSource.
diff --git a/src/com/android/email/ConversationInfo.java b/src/com/android/mail/ConversationInfo.java
similarity index 98%
rename from src/com/android/email/ConversationInfo.java
rename to src/com/android/mail/ConversationInfo.java
index 12af4c2..a380ceb 100644
--- a/src/com/android/email/ConversationInfo.java
+++ b/src/com/android/mail/ConversationInfo.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
-import com.android.email.providers.UIProvider;
+import com.android.mail.providers.UIProvider;
import com.google.common.base.Objects;
import android.content.Context;
diff --git a/src/com/android/email/ConversationListContext.java b/src/com/android/mail/ConversationListContext.java
similarity index 97%
rename from src/com/android/email/ConversationListContext.java
rename to src/com/android/mail/ConversationListContext.java
index 011d3f3..550a20f 100644
--- a/src/com/android/email/ConversationListContext.java
+++ b/src/com/android/mail/ConversationListContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
/**
* This class is supposed to have the same thing that the Gmail ConversationListContext
diff --git a/src/com/android/email/FormattedDateBuilder.java b/src/com/android/mail/FormattedDateBuilder.java
similarity index 98%
rename from src/com/android/email/FormattedDateBuilder.java
rename to src/com/android/mail/FormattedDateBuilder.java
index 1c7f345..2ceb388 100644
--- a/src/com/android/email/FormattedDateBuilder.java
+++ b/src/com/android/mail/FormattedDateBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
import android.content.Context;
import android.text.format.DateUtils;
diff --git a/src/com/android/email/MailActionBar.java b/src/com/android/mail/MailActionBar.java
similarity index 87%
rename from src/com/android/email/MailActionBar.java
rename to src/com/android/mail/MailActionBar.java
index 21aea6b..8aeae2a 100644
--- a/src/com/android/email/MailActionBar.java
+++ b/src/com/android/mail/MailActionBar.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
import android.app.ActionBar;
import android.app.ActionBar.OnNavigationListener;
@@ -115,7 +115,7 @@
}
/* (non-Javadoc)
- * @see com.android.email.ActionBarView#createOptionsMenu(android.view.Menu)
+ * @see com.android.mail.ActionBarView#createOptionsMenu(android.view.Menu)
*/
@Override
public boolean createOptionsMenu(Menu menu) {
@@ -130,7 +130,7 @@
}
/* (non-Javadoc)
- * @see com.android.email.ActionBarView#getMode()
+ * @see com.android.mail.ActionBarView#getMode()
*/
@Override
public Mode getMode() {
@@ -138,7 +138,7 @@
}
/* (non-Javadoc)
- * @see com.android.email.ActionBarView#getOptionsMenuId()
+ * @see com.android.mail.ActionBarView#getOptionsMenuId()
*/
@Override
public int getOptionsMenuId() {
@@ -158,7 +158,7 @@
}
/* (non-Javadoc)
- * @see com.android.email.ActionBarView#handleRestore(android.os.Bundle)
+ * @see com.android.mail.ActionBarView#handleRestore(android.os.Bundle)
*/
@Override
public void handleRestore(Bundle savedInstanceState) {
@@ -167,7 +167,7 @@
}
/* (non-Javadoc)
- * @see com.android.email.ActionBarView#handleSaveInstanceState(android.os.Bundle)
+ * @see com.android.mail.ActionBarView#handleSaveInstanceState(android.os.Bundle)
*/
@Override
public void handleSaveInstanceState(Bundle outState) {
@@ -176,7 +176,7 @@
}
/*
- * @see com.android.email.ActionBarView#initialize(com.android.email.RestrictedActivity, com.android.email.MailActionBar.Callback, com.android.email.ViewMode, android.app.ActionBar)
+ * @see com.android.mail.ActionBarView#initialize(com.android.mail.RestrictedActivity, com.android.mail.MailActionBar.Callback, com.android.mail.ViewMode, android.app.ActionBar)
*/
@Override
public void initialize(RestrictedActivity activity, Callback callback, ViewMode viewMode,
@@ -195,7 +195,7 @@
}
/* (non-Javadoc)
- * @see com.android.email.ActionBarView#onPause()
+ * @see com.android.mail.ActionBarView#onPause()
*/
@Override
public void onPause() {
@@ -204,7 +204,7 @@
}
/* (non-Javadoc)
- * @see com.android.email.ActionBarView#onResume()
+ * @see com.android.mail.ActionBarView#onResume()
*/
@Override
public void onResume() {
@@ -213,7 +213,7 @@
}
/* (non-Javadoc)
- * @see com.android.email.ActionBarView#onStatusResult(java.lang.String, int)
+ * @see com.android.mail.ActionBarView#onStatusResult(java.lang.String, int)
*/
@Override
public void onStatusResult(String account, int status) {
@@ -222,7 +222,7 @@
}
/* (non-Javadoc)
- * @see com.android.email.ActionBarView#prepareOptionsMenu()
+ * @see com.android.mail.ActionBarView#prepareOptionsMenu()
*/
@Override
public boolean prepareOptionsMenu(Menu menu) {
@@ -262,7 +262,7 @@
}
/* (non-Javadoc)
- * @see com.android.email.ActionBarView#setActionBarIconHome()
+ * @see com.android.mail.ActionBarView#setActionBarIconHome()
*/
@Override
public void removeBackButton() {
@@ -277,7 +277,7 @@
}
/* (non-Javadoc)
- * @see com.android.email.ActionBarView#setActionBarIconBack()
+ * @see com.android.mail.ActionBarView#setActionBarIconBack()
*/
@Override
public void setBackButton() {
@@ -292,7 +292,7 @@
}
/* (non-Javadoc)
- * @see com.android.email.ActionBarView#setLabel(java.lang.String)
+ * @see com.android.mail.ActionBarView#setLabel(java.lang.String)
*/
@Override
public void setLabel(String label) {
@@ -304,7 +304,7 @@
}
/* (non-Javadoc)
- * @see com.android.email.ActionBarView#setMode(com.android.email.ActionBarView.Mode)
+ * @see com.android.mail.ActionBarView#setMode(com.android.mail.ActionBarView.Mode)
*/
@Override
public boolean setMode(Mode mode) {
@@ -313,7 +313,7 @@
}
/* (non-Javadoc)
- * @see com.android.email.ActionBarView#updateActionBar(java.lang.String[], java.lang.String)
+ * @see com.android.mail.ActionBarView#updateActionBar(java.lang.String[], java.lang.String)
*/
@Override
public void updateActionBar(String[] accounts, String currentAccount) {
diff --git a/src/com/android/email/MinTimeProgressDialog.java b/src/com/android/mail/MinTimeProgressDialog.java
similarity index 99%
rename from src/com/android/email/MinTimeProgressDialog.java
rename to src/com/android/mail/MinTimeProgressDialog.java
index 89a125a..5c3f2ff 100644
--- a/src/com/android/email/MinTimeProgressDialog.java
+++ b/src/com/android/mail/MinTimeProgressDialog.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
import android.app.ProgressDialog;
import android.content.Context;
diff --git a/src/com/android/email/MinTimeProgressView.java b/src/com/android/mail/MinTimeProgressView.java
similarity index 98%
rename from src/com/android/email/MinTimeProgressView.java
rename to src/com/android/mail/MinTimeProgressView.java
index 402c909..9192c95 100644
--- a/src/com/android/email/MinTimeProgressView.java
+++ b/src/com/android/mail/MinTimeProgressView.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
import android.content.Context;
import android.os.Handler;
diff --git a/src/com/android/email/RestrictedActivity.java b/src/com/android/mail/RestrictedActivity.java
similarity index 98%
rename from src/com/android/email/RestrictedActivity.java
rename to src/com/android/mail/RestrictedActivity.java
index 6186b77..c39941f 100644
--- a/src/com/android/email/RestrictedActivity.java
+++ b/src/com/android/mail/RestrictedActivity.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
import android.app.ActionBar;
import android.app.Activity;
diff --git a/src/com/android/email/SenderInfoLoader.java b/src/com/android/mail/SenderInfoLoader.java
similarity index 99%
rename from src/com/android/email/SenderInfoLoader.java
rename to src/com/android/mail/SenderInfoLoader.java
index 0f613a3..746298c 100644
--- a/src/com/android/email/SenderInfoLoader.java
+++ b/src/com/android/mail/SenderInfoLoader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
diff --git a/src/com/android/email/UiHandler.java b/src/com/android/mail/UiHandler.java
similarity index 97%
rename from src/com/android/email/UiHandler.java
rename to src/com/android/mail/UiHandler.java
index 42d9dc0..696e1e9 100644
--- a/src/com/android/email/UiHandler.java
+++ b/src/com/android/mail/UiHandler.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
import android.app.Activity;
import android.app.FragmentTransaction;
import android.os.Handler;
-import com.android.email.utils.LogUtils;
+import com.android.mail.utils.LogUtils;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/src/com/android/email/UndoBarView.java b/src/com/android/mail/UndoBarView.java
similarity index 99%
rename from src/com/android/email/UndoBarView.java
rename to src/com/android/mail/UndoBarView.java
index 94737df..c68c05d 100644
--- a/src/com/android/email/UndoBarView.java
+++ b/src/com/android/mail/UndoBarView.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
import com.google.common.collect.ImmutableSet;
diff --git a/src/com/android/email/UndoOperation.java b/src/com/android/mail/UndoOperation.java
similarity index 98%
rename from src/com/android/email/UndoOperation.java
rename to src/com/android/mail/UndoOperation.java
index 4631516..2797e5a 100644
--- a/src/com/android/email/UndoOperation.java
+++ b/src/com/android/mail/UndoOperation.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
import android.os.Bundle;
diff --git a/src/com/android/email/UnifiedEmail.java b/src/com/android/mail/UnifiedEmail.java
similarity index 87%
rename from src/com/android/email/UnifiedEmail.java
rename to src/com/android/mail/UnifiedEmail.java
index 1ca28a3..5c0c8e0 100644
--- a/src/com/android/email/UnifiedEmail.java
+++ b/src/com/android/mail/UnifiedEmail.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
-import com.android.email.browse.ConversationListActivity;
-import com.android.email.browse.ActionbarActivity;
-import com.android.email.browse.FolderItem;
-import com.android.email.compose.ComposeActivity;
+import com.android.mail.browse.ConversationListActivity;
+import com.android.mail.browse.ActionbarActivity;
+import com.android.mail.browse.FolderItem;
+import com.android.mail.compose.ComposeActivity;
import android.app.Activity;
import android.content.ComponentName;
diff --git a/src/com/android/email/ViewMode.java b/src/com/android/mail/ViewMode.java
similarity index 98%
rename from src/com/android/email/ViewMode.java
rename to src/com/android/mail/ViewMode.java
index f3544cf..c3631f8 100644
--- a/src/com/android/email/ViewMode.java
+++ b/src/com/android/mail/ViewMode.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package com.android.email;
+package com.android.mail;
-import com.android.email.utils.Utils;
+import com.android.mail.utils.Utils;
import com.google.common.collect.Lists;
import android.content.Context;
diff --git a/src/com/android/email/browse/ActionbarActivity.java b/src/com/android/mail/browse/ActionbarActivity.java
similarity index 93%
rename from src/com/android/email/browse/ActionbarActivity.java
rename to src/com/android/mail/browse/ActionbarActivity.java
index 5a61386..e07c394 100644
--- a/src/com/android/email/browse/ActionbarActivity.java
+++ b/src/com/android/mail/browse/ActionbarActivity.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package com.android.email.browse;
+package com.android.mail.browse;
-import com.android.email.ConversationListContext;
-import com.android.email.MailActionBar;
-import com.android.email.ActionBarView.Mode;
-import com.android.email.MailActionBar.Callback;
-import com.android.email.RestrictedActivity;
-import com.android.email.R;
-import com.android.email.ViewMode;
+import com.android.mail.ConversationListContext;
+import com.android.mail.MailActionBar;
+import com.android.mail.ActionBarView.Mode;
+import com.android.mail.MailActionBar.Callback;
+import com.android.mail.RestrictedActivity;
+import com.android.mail.R;
+import com.android.mail.ViewMode;
import android.app.ActionBar;
import android.app.Activity;
diff --git a/src/com/android/email/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
similarity index 99%
rename from src/com/android/email/browse/ConversationItemView.java
rename to src/com/android/mail/browse/ConversationItemView.java
index b7f4297..9a6ab32 100644
--- a/src/com/android/email/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package com.android.email.browse;
+package com.android.mail.browse;
-import com.android.email.browse.ConversationItemViewModel.SenderFragment;
-import com.android.email.perf.Timer;
-import com.android.email.R;
-import com.android.email.ViewMode;
-import com.android.email.utils.Utils;
+import com.android.mail.browse.ConversationItemViewModel.SenderFragment;
+import com.android.mail.perf.Timer;
+import com.android.mail.R;
+import com.android.mail.ViewMode;
+import com.android.mail.utils.Utils;
import com.google.common.annotations.VisibleForTesting;
import android.content.Context;
diff --git a/src/com/android/email/browse/ConversationItemViewCoordinates.java b/src/com/android/mail/browse/ConversationItemViewCoordinates.java
similarity index 98%
rename from src/com/android/email/browse/ConversationItemViewCoordinates.java
rename to src/com/android/mail/browse/ConversationItemViewCoordinates.java
index 3d67453..c411d46 100644
--- a/src/com/android/email/browse/ConversationItemViewCoordinates.java
+++ b/src/com/android/mail/browse/ConversationItemViewCoordinates.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.android.email.browse;
+package com.android.mail.browse;
import android.content.Context;
import android.content.res.Resources;
@@ -26,8 +26,8 @@
import android.view.View.MeasureSpec;
import android.view.ViewParent;
import android.widget.TextView;
-import com.android.email.R;
-import com.android.email.ViewMode;
+import com.android.mail.R;
+import com.android.mail.ViewMode;
/**
* Represents the coordinates of elements inside a CanvasConversationHeaderView
diff --git a/src/com/android/email/browse/ConversationItemViewModel.java b/src/com/android/mail/browse/ConversationItemViewModel.java
similarity index 98%
rename from src/com/android/email/browse/ConversationItemViewModel.java
rename to src/com/android/mail/browse/ConversationItemViewModel.java
index 8890408..bf02797 100644
--- a/src/com/android/email/browse/ConversationItemViewModel.java
+++ b/src/com/android/mail/browse/ConversationItemViewModel.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package com.android.email.browse;
+package com.android.mail.browse;
-import com.android.email.providers.UIProvider;
+import com.android.mail.providers.UIProvider;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
-import com.android.email.R;
+import com.android.mail.R;
import android.content.Context;
import android.database.Cursor;
diff --git a/src/com/android/email/browse/ConversationListActivity.java b/src/com/android/mail/browse/ConversationListActivity.java
similarity index 96%
rename from src/com/android/email/browse/ConversationListActivity.java
rename to src/com/android/mail/browse/ConversationListActivity.java
index 310fdb6..674417f 100644
--- a/src/com/android/email/browse/ConversationListActivity.java
+++ b/src/com/android/mail/browse/ConversationListActivity.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.android.email.browse;
+package com.android.mail.browse;
import android.app.Activity;
import android.content.ContentResolver;
@@ -38,11 +38,11 @@
import android.widget.AdapterView.OnItemClickListener;
import android.widget.AdapterView.OnItemSelectedListener;
-import com.android.email.R;
-import com.android.email.ViewMode;
-import com.android.email.compose.ComposeActivity;
-import com.android.email.providers.AccountCacheProvider;
-import com.android.email.providers.UIProvider;
+import com.android.mail.R;
+import com.android.mail.ViewMode;
+import com.android.mail.compose.ComposeActivity;
+import com.android.mail.providers.AccountCacheProvider;
+import com.android.mail.providers.UIProvider;
public class ConversationListActivity extends Activity implements OnItemSelectedListener,
OnItemClickListener {
diff --git a/src/com/android/email/browse/ConversationViewActivity.java b/src/com/android/mail/browse/ConversationViewActivity.java
similarity index 94%
rename from src/com/android/email/browse/ConversationViewActivity.java
rename to src/com/android/mail/browse/ConversationViewActivity.java
index 127e484..f5a2735 100644
--- a/src/com/android/email/browse/ConversationViewActivity.java
+++ b/src/com/android/mail/browse/ConversationViewActivity.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.browse;
+package com.android.mail.browse;
-import com.android.email.FormattedDateBuilder;
-import com.android.email.R;
-import com.android.email.providers.UIProvider;
-import com.android.email.utils.Utils;
+import com.android.mail.FormattedDateBuilder;
+import com.android.mail.R;
+import com.android.mail.providers.UIProvider;
+import com.android.mail.utils.Utils;
import android.app.Activity;
import android.content.ContentResolver;
diff --git a/src/com/android/email/browse/FolderItem.java b/src/com/android/mail/browse/FolderItem.java
similarity index 93%
rename from src/com/android/email/browse/FolderItem.java
rename to src/com/android/mail/browse/FolderItem.java
index 1fc80d6..b8b7e5b 100644
--- a/src/com/android/email/browse/FolderItem.java
+++ b/src/com/android/mail/browse/FolderItem.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package com.android.email.browse;
+package com.android.mail.browse;
import android.app.Activity;
import android.os.Bundle;
-import com.android.email.R;
+import com.android.mail.R;
public class FolderItem extends Activity {
diff --git a/src/com/android/email/browse/HeaderBlock.java b/src/com/android/mail/browse/HeaderBlock.java
similarity index 97%
rename from src/com/android/email/browse/HeaderBlock.java
rename to src/com/android/mail/browse/HeaderBlock.java
index a765725..6fb934e 100644
--- a/src/com/android/email/browse/HeaderBlock.java
+++ b/src/com/android/mail/browse/HeaderBlock.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.android.email.browse;
+package com.android.mail.browse;
/**
* A header block in the conversation view that corresponds to a region in the web content. It may
diff --git a/src/com/android/email/browse/MergedAdapter.java b/src/com/android/mail/browse/MergedAdapter.java
similarity index 99%
rename from src/com/android/email/browse/MergedAdapter.java
rename to src/com/android/mail/browse/MergedAdapter.java
index 49d9780..0212095 100644
--- a/src/com/android/email/browse/MergedAdapter.java
+++ b/src/com/android/mail/browse/MergedAdapter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.android.email.browse;
+package com.android.mail.browse;
import android.database.DataSetObserver;
import android.view.View;
diff --git a/src/com/android/email/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
similarity index 98%
rename from src/com/android/email/browse/MessageHeaderView.java
rename to src/com/android/mail/browse/MessageHeaderView.java
index 78f351e..026b735 100644
--- a/src/com/android/email/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.email.browse;
+package com.android.mail.browse;
import android.content.Context;
import android.database.Cursor;
@@ -39,17 +39,17 @@
import android.widget.Toast;
import android.widget.PopupMenu.OnMenuItemClickListener;
-import com.android.email.ContactInfoSource;
-import com.android.email.FormattedDateBuilder;
-import com.android.email.compose.ComposeActivity;
-import com.android.email.perf.Timer;
-import com.android.email.providers.Address;
-import com.android.email.providers.Attachment;
-import com.android.email.providers.UIProvider;
-import com.android.email.R;
-import com.android.email.SenderInfoLoader.ContactInfo;
-import com.android.email.utils.LogUtils;
-import com.android.email.utils.Utils;
+import com.android.mail.ContactInfoSource;
+import com.android.mail.FormattedDateBuilder;
+import com.android.mail.compose.ComposeActivity;
+import com.android.mail.perf.Timer;
+import com.android.mail.providers.Address;
+import com.android.mail.providers.Attachment;
+import com.android.mail.providers.UIProvider;
+import com.android.mail.R;
+import com.android.mail.SenderInfoLoader.ContactInfo;
+import com.android.mail.utils.LogUtils;
+import com.android.mail.utils.Utils;
import com.google.common.annotations.VisibleForTesting;
import java.io.IOException;
diff --git a/src/com/android/email/browse/MultiAdapterSpinner.java b/src/com/android/mail/browse/MultiAdapterSpinner.java
similarity index 97%
rename from src/com/android/email/browse/MultiAdapterSpinner.java
rename to src/com/android/mail/browse/MultiAdapterSpinner.java
index 5e7ac9c..07c9db5 100644
--- a/src/com/android/email/browse/MultiAdapterSpinner.java
+++ b/src/com/android/mail/browse/MultiAdapterSpinner.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package com.android.email.browse;
+package com.android.mail.browse;
-import com.android.email.browse.MergedAdapter.ListSpinnerAdapter;
-import com.android.email.browse.MergedAdapter.LocalAdapterPosition;
+import com.android.mail.browse.MergedAdapter.ListSpinnerAdapter;
+import com.android.mail.browse.MergedAdapter.LocalAdapterPosition;
import android.content.Context;
import android.graphics.Rect;
diff --git a/src/com/android/email/browse/SnippetTextView.java b/src/com/android/mail/browse/SnippetTextView.java
similarity index 98%
rename from src/com/android/email/browse/SnippetTextView.java
rename to src/com/android/mail/browse/SnippetTextView.java
index 51d9310..911de40 100644
--- a/src/com/android/email/browse/SnippetTextView.java
+++ b/src/com/android/mail/browse/SnippetTextView.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.android.email.browse;
+package com.android.mail.browse;
import android.content.Context;
import android.text.Layout;
diff --git a/src/com/android/email/browse/WebViewContextMenu.java b/src/com/android/mail/browse/WebViewContextMenu.java
similarity index 99%
rename from src/com/android/email/browse/WebViewContextMenu.java
rename to src/com/android/mail/browse/WebViewContextMenu.java
index 587a748..b312d40 100644
--- a/src/com/android/email/browse/WebViewContextMenu.java
+++ b/src/com/android/mail/browse/WebViewContextMenu.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.android.email.browse;
+package com.android.mail.browse;
import android.app.Activity;
import android.content.ClipData;
diff --git a/src/com/android/email/compose/AttachmentComposeView.java b/src/com/android/mail/compose/AttachmentComposeView.java
similarity index 92%
rename from src/com/android/email/compose/AttachmentComposeView.java
rename to src/com/android/mail/compose/AttachmentComposeView.java
index 9815df8..cbcdc97 100644
--- a/src/com/android/email/compose/AttachmentComposeView.java
+++ b/src/com/android/mail/compose/AttachmentComposeView.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.compose;
+package com.android.mail.compose;
import android.content.Context;
import android.view.LayoutInflater;
@@ -22,10 +22,10 @@
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.android.email.providers.Attachment;
-import com.android.email.R;
-import com.android.email.utils.AttachmentUtils;
-import com.android.email.utils.LogUtils;
+import com.android.mail.providers.Attachment;
+import com.android.mail.R;
+import com.android.mail.utils.AttachmentUtils;
+import com.android.mail.utils.LogUtils;
/**
* This view is used in the ComposeActivity to display an attachment along with its name/size
diff --git a/src/com/android/email/compose/AttachmentsView.java b/src/com/android/mail/compose/AttachmentsView.java
similarity index 97%
rename from src/com/android/email/compose/AttachmentsView.java
rename to src/com/android/mail/compose/AttachmentsView.java
index c681534..e7d5447 100644
--- a/src/com/android/email/compose/AttachmentsView.java
+++ b/src/com/android/mail/compose/AttachmentsView.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.compose;
+package com.android.mail.compose;
-import com.android.email.providers.Attachment;
+import com.android.mail.providers.Attachment;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
diff --git a/src/com/android/email/compose/CcBccView.java b/src/com/android/mail/compose/CcBccView.java
similarity index 98%
rename from src/com/android/email/compose/CcBccView.java
rename to src/com/android/mail/compose/CcBccView.java
index 0a2e5a7..c6fcbf0 100644
--- a/src/com/android/email/compose/CcBccView.java
+++ b/src/com/android/mail/compose/CcBccView.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.compose;
+package com.android.mail.compose;
import android.animation.Animator;
import android.animation.AnimatorSet;
@@ -24,7 +24,7 @@
import android.view.LayoutInflater;
import android.view.View;
import android.widget.RelativeLayout;
-import com.android.email.R;
+import com.android.mail.R;
public class CcBccView extends RelativeLayout {
diff --git a/src/com/android/email/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
similarity index 98%
rename from src/com/android/email/compose/ComposeActivity.java
rename to src/com/android/mail/compose/ComposeActivity.java
index 8f6f92a..66b532a 100644
--- a/src/com/android/email/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.email.compose;
+package com.android.mail.compose;
import android.accounts.Account;
import android.app.ActionBar;
@@ -51,16 +51,16 @@
import android.widget.Toast;
import com.android.common.Rfc822Validator;
-import com.android.email.compose.QuotedTextView.RespondInlineListener;
-import com.android.email.providers.Address;
-import com.android.email.providers.Attachment;
-import com.android.email.providers.UIProvider;
-import com.android.email.providers.protos.mock.MockAttachment;
-import com.android.email.R;
-import com.android.email.utils.AccountUtils;
-import com.android.email.utils.LogUtils;
-import com.android.email.utils.MimeType;
-import com.android.email.utils.Utils;
+import com.android.mail.compose.QuotedTextView.RespondInlineListener;
+import com.android.mail.providers.Address;
+import com.android.mail.providers.Attachment;
+import com.android.mail.providers.UIProvider;
+import com.android.mail.providers.protos.mock.MockAttachment;
+import com.android.mail.R;
+import com.android.mail.utils.AccountUtils;
+import com.android.mail.utils.LogUtils;
+import com.android.mail.utils.MimeType;
+import com.android.mail.utils.Utils;
import com.android.ex.chips.RecipientEditTextView;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Sets;
diff --git a/src/com/android/email/compose/FromAddressSpinnerAdapter.java b/src/com/android/mail/compose/FromAddressSpinnerAdapter.java
similarity index 97%
rename from src/com/android/email/compose/FromAddressSpinnerAdapter.java
rename to src/com/android/mail/compose/FromAddressSpinnerAdapter.java
index d9c0872..92215e2 100644
--- a/src/com/android/email/compose/FromAddressSpinnerAdapter.java
+++ b/src/com/android/mail/compose/FromAddressSpinnerAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.compose;
+package com.android.mail.compose;
import android.content.Context;
import android.view.LayoutInflater;
@@ -23,7 +23,7 @@
import android.widget.Spinner;
import android.widget.TextView;
-import com.android.email.R;
+import com.android.mail.R;
/**
* FromAddressSpinnerAdapter returns the correct spinner adapter for reply from
diff --git a/src/com/android/email/compose/QuotedTextView.java b/src/com/android/mail/compose/QuotedTextView.java
similarity index 98%
rename from src/com/android/email/compose/QuotedTextView.java
rename to src/com/android/mail/compose/QuotedTextView.java
index 9041c74..c5b2f24 100644
--- a/src/com/android/email/compose/QuotedTextView.java
+++ b/src/com/android/mail/compose/QuotedTextView.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.compose;
+package com.android.mail.compose;
-import com.android.email.R;
-import com.android.email.utils.Utils;
+import com.android.mail.R;
+import com.android.mail.utils.Utils;
import android.content.Context;
import android.text.Html;
diff --git a/src/com/android/email/compose/RecipientAdapter.java b/src/com/android/mail/compose/RecipientAdapter.java
similarity index 96%
rename from src/com/android/email/compose/RecipientAdapter.java
rename to src/com/android/mail/compose/RecipientAdapter.java
index 5826b3d..1544168 100644
--- a/src/com/android/email/compose/RecipientAdapter.java
+++ b/src/com/android/mail/compose/RecipientAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.compose;
+package com.android.mail.compose;
import com.android.ex.chips.BaseRecipientAdapter;
diff --git a/src/com/android/email/lib/base/ByteArrays.java b/src/com/android/mail/lib/base/ByteArrays.java
similarity index 97%
rename from src/com/android/email/lib/base/ByteArrays.java
rename to src/com/android/mail/lib/base/ByteArrays.java
index 786fde4..da811f2 100644
--- a/src/com/android/email/lib/base/ByteArrays.java
+++ b/src/com/android/mail/lib/base/ByteArrays.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.lib.base;
+package com.android.mail.lib.base;
/**
* Static utility methods pertaining especially to byte arrays. Note that I/O-related functionality
diff --git a/src/com/android/email/lib/base/CharEscaper.java b/src/com/android/mail/lib/base/CharEscaper.java
similarity index 98%
rename from src/com/android/email/lib/base/CharEscaper.java
rename to src/com/android/mail/lib/base/CharEscaper.java
index 85f2f75..63ee395 100644
--- a/src/com/android/email/lib/base/CharEscaper.java
+++ b/src/com/android/mail/lib/base/CharEscaper.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.lib.base;
+package com.android.mail.lib.base;
-import static com.android.email.lib.base.Preconditions.checkNotNull;
+import static com.android.mail.lib.base.Preconditions.checkNotNull;
import java.io.IOException;
diff --git a/src/com/android/email/lib/base/CharEscaperBuilder.java b/src/com/android/mail/lib/base/CharEscaperBuilder.java
similarity index 98%
rename from src/com/android/email/lib/base/CharEscaperBuilder.java
rename to src/com/android/mail/lib/base/CharEscaperBuilder.java
index 6fd6559..a11eac2 100644
--- a/src/com/android/email/lib/base/CharEscaperBuilder.java
+++ b/src/com/android/mail/lib/base/CharEscaperBuilder.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.lib.base;
+package com.android.mail.lib.base;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/com/android/email/lib/base/CharEscapers.java b/src/com/android/mail/lib/base/CharEscapers.java
similarity index 99%
rename from src/com/android/email/lib/base/CharEscapers.java
rename to src/com/android/mail/lib/base/CharEscapers.java
index 87efa5c..7a76ffe 100644
--- a/src/com/android/email/lib/base/CharEscapers.java
+++ b/src/com/android/mail/lib/base/CharEscapers.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.lib.base;
+package com.android.mail.lib.base;
-import static com.android.email.lib.base.Preconditions.checkNotNull;
+import static com.android.mail.lib.base.Preconditions.checkNotNull;
import java.io.IOException;
diff --git a/src/com/android/email/lib/base/CharMatcher.java b/src/com/android/mail/lib/base/CharMatcher.java
similarity index 99%
rename from src/com/android/email/lib/base/CharMatcher.java
rename to src/com/android/mail/lib/base/CharMatcher.java
index ec29e9e..9ff3161 100644
--- a/src/com/android/email/lib/base/CharMatcher.java
+++ b/src/com/android/mail/lib/base/CharMatcher.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.email.lib.base;
+package com.android.mail.lib.base;
-import static com.android.email.lib.base.Preconditions.checkArgument;
-import static com.android.email.lib.base.Preconditions.checkNotNull;
+import static com.android.mail.lib.base.Preconditions.checkArgument;
+import static com.android.mail.lib.base.Preconditions.checkNotNull;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/src/com/android/email/lib/base/Escaper.java b/src/com/android/mail/lib/base/Escaper.java
similarity index 98%
rename from src/com/android/email/lib/base/Escaper.java
rename to src/com/android/mail/lib/base/Escaper.java
index e604e0a..9f6b8f0 100644
--- a/src/com/android/email/lib/base/Escaper.java
+++ b/src/com/android/mail/lib/base/Escaper.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.lib.base;
+package com.android.mail.lib.base;
/**
* An object that converts literal text into a format safe for inclusion in a particular context
diff --git a/src/com/android/email/lib/base/Function.java b/src/com/android/mail/lib/base/Function.java
similarity index 98%
rename from src/com/android/email/lib/base/Function.java
rename to src/com/android/mail/lib/base/Function.java
index c3cc127..6df8289 100644
--- a/src/com/android/email/lib/base/Function.java
+++ b/src/com/android/mail/lib/base/Function.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.email.lib.base;
+package com.android.mail.lib.base;
/**
* A transformation from one object to another. For example, a
diff --git a/src/com/android/email/lib/base/PercentEscaper.java b/src/com/android/mail/lib/base/PercentEscaper.java
similarity index 98%
rename from src/com/android/email/lib/base/PercentEscaper.java
rename to src/com/android/mail/lib/base/PercentEscaper.java
index db41a2d..e7baa36 100644
--- a/src/com/android/email/lib/base/PercentEscaper.java
+++ b/src/com/android/mail/lib/base/PercentEscaper.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.lib.base;
+package com.android.mail.lib.base;
-import static com.android.email.lib.base.Preconditions.checkNotNull;
+import static com.android.mail.lib.base.Preconditions.checkNotNull;
/**
* A {@code UnicodeEscaper} that escapes some set of Java characters using
diff --git a/src/com/android/email/lib/base/Platform.java b/src/com/android/mail/lib/base/Platform.java
similarity index 97%
rename from src/com/android/email/lib/base/Platform.java
rename to src/com/android/mail/lib/base/Platform.java
index b920f9a..78e29f3 100644
--- a/src/com/android/email/lib/base/Platform.java
+++ b/src/com/android/mail/lib/base/Platform.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.email.lib.base;
+package com.android.mail.lib.base;
/**
diff --git a/src/com/android/email/lib/base/Preconditions.java b/src/com/android/mail/lib/base/Preconditions.java
similarity index 99%
rename from src/com/android/email/lib/base/Preconditions.java
rename to src/com/android/mail/lib/base/Preconditions.java
index 88b8fd6..ebf661a 100644
--- a/src/com/android/email/lib/base/Preconditions.java
+++ b/src/com/android/mail/lib/base/Preconditions.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.email.lib.base;
+package com.android.mail.lib.base;
import java.util.NoSuchElementException;
diff --git a/src/com/android/email/lib/base/Predicate.java b/src/com/android/mail/lib/base/Predicate.java
similarity index 98%
rename from src/com/android/email/lib/base/Predicate.java
rename to src/com/android/mail/lib/base/Predicate.java
index 5b19140..009f028 100644
--- a/src/com/android/email/lib/base/Predicate.java
+++ b/src/com/android/mail/lib/base/Predicate.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.email.lib.base;
+package com.android.mail.lib.base;
/**
diff --git a/src/com/android/email/lib/base/Splitter.java b/src/com/android/mail/lib/base/Splitter.java
similarity index 98%
rename from src/com/android/email/lib/base/Splitter.java
rename to src/com/android/mail/lib/base/Splitter.java
index 6e7c085..205cd2c 100644
--- a/src/com/android/email/lib/base/Splitter.java
+++ b/src/com/android/mail/lib/base/Splitter.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.android.email.lib.base;
+package com.android.mail.lib.base;
-import static com.android.email.lib.base.Preconditions.checkArgument;
-import static com.android.email.lib.base.Preconditions.checkNotNull;
-import static com.android.email.lib.base.Preconditions.checkState;
+import static com.android.mail.lib.base.Preconditions.checkArgument;
+import static com.android.mail.lib.base.Preconditions.checkNotNull;
+import static com.android.mail.lib.base.Preconditions.checkState;
import com.google.common.base.Joiner;
diff --git a/src/com/android/email/lib/base/StringUtil.java b/src/com/android/mail/lib/base/StringUtil.java
similarity index 99%
rename from src/com/android/email/lib/base/StringUtil.java
rename to src/com/android/mail/lib/base/StringUtil.java
index 8276cc4..5bfca7f 100644
--- a/src/com/android/email/lib/base/StringUtil.java
+++ b/src/com/android/mail/lib/base/StringUtil.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.lib.base;
+package com.android.mail.lib.base;
-import static com.android.email.lib.base.Preconditions.checkArgument;
+import static com.android.mail.lib.base.Preconditions.checkArgument;
import com.google.common.base.Joiner;
import com.google.common.base.Joiner.MapJoiner;
diff --git a/src/com/android/email/lib/base/Strings.java b/src/com/android/mail/lib/base/Strings.java
similarity index 96%
rename from src/com/android/email/lib/base/Strings.java
rename to src/com/android/mail/lib/base/Strings.java
index 9423050..2fd6a97 100644
--- a/src/com/android/email/lib/base/Strings.java
+++ b/src/com/android/mail/lib/base/Strings.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.email.lib.base;
+package com.android.mail.lib.base;
-import static com.android.email.lib.base.Preconditions.checkArgument;
-import static com.android.email.lib.base.Preconditions.checkNotNull;
+import static com.android.mail.lib.base.Preconditions.checkArgument;
+import static com.android.mail.lib.base.Preconditions.checkNotNull;
import java.util.Formatter;
diff --git a/src/com/android/email/lib/base/UnicodeEscaper.java b/src/com/android/mail/lib/base/UnicodeEscaper.java
similarity index 98%
rename from src/com/android/email/lib/base/UnicodeEscaper.java
rename to src/com/android/mail/lib/base/UnicodeEscaper.java
index 110c163..95eb06e 100644
--- a/src/com/android/email/lib/base/UnicodeEscaper.java
+++ b/src/com/android/mail/lib/base/UnicodeEscaper.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.email.lib.base;
+package com.android.mail.lib.base;
-import static com.android.email.lib.base.Preconditions.checkNotNull;
-import static com.android.email.lib.base.Preconditions.checkPositionIndexes;
+import static com.android.mail.lib.base.Preconditions.checkNotNull;
+import static com.android.mail.lib.base.Preconditions.checkPositionIndexes;
import java.io.IOException;
diff --git a/src/com/android/email/lib/base/X.java b/src/com/android/mail/lib/base/X.java
similarity index 97%
rename from src/com/android/email/lib/base/X.java
rename to src/com/android/mail/lib/base/X.java
index 0cd4dfb..62bf032 100644
--- a/src/com/android/email/lib/base/X.java
+++ b/src/com/android/mail/lib/base/X.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.email.lib.base;
+package com.android.mail.lib.base;
/**
* A utility class that contains some very widely used functionality.
diff --git a/src/com/android/email/lib/html/parser/HTML.java b/src/com/android/mail/lib/html/parser/HTML.java
similarity index 98%
rename from src/com/android/email/lib/html/parser/HTML.java
rename to src/com/android/mail/lib/html/parser/HTML.java
index d0d0e9a..0ed05f7 100644
--- a/src/com/android/email/lib/html/parser/HTML.java
+++ b/src/com/android/mail/lib/html/parser/HTML.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.lib.html.parser;
+package com.android.mail.lib.html.parser;
-import com.android.email.lib.base.Preconditions;
+import com.android.mail.lib.base.Preconditions;
import java.util.Set;
diff --git a/src/com/android/email/lib/html/parser/HTML4.java b/src/com/android/mail/lib/html/parser/HTML4.java
similarity index 99%
rename from src/com/android/email/lib/html/parser/HTML4.java
rename to src/com/android/mail/lib/html/parser/HTML4.java
index 92b705b..9101fa2 100644
--- a/src/com/android/email/lib/html/parser/HTML4.java
+++ b/src/com/android/mail/lib/html/parser/HTML4.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.lib.html.parser;
+package com.android.mail.lib.html.parser;
import com.google.common.collect.Maps;
diff --git a/src/com/android/email/lib/html/parser/HtmlDocument.java b/src/com/android/mail/lib/html/parser/HtmlDocument.java
similarity index 99%
rename from src/com/android/email/lib/html/parser/HtmlDocument.java
rename to src/com/android/mail/lib/html/parser/HtmlDocument.java
index 3865968..09a6bbc 100644
--- a/src/com/android/email/lib/html/parser/HtmlDocument.java
+++ b/src/com/android/mail/lib/html/parser/HtmlDocument.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.lib.html.parser;
+package com.android.mail.lib.html.parser;
-import com.android.email.lib.base.CharEscapers;
-import com.android.email.lib.base.CharMatcher;
-import com.android.email.lib.base.StringUtil;
-import com.android.email.lib.base.X;
+import com.android.mail.lib.base.CharEscapers;
+import com.android.mail.lib.base.CharMatcher;
+import com.android.mail.lib.base.StringUtil;
+import com.android.mail.lib.base.X;
import com.google.common.collect.Lists;
import java.io.PrintWriter;
diff --git a/src/com/android/email/lib/html/parser/HtmlParser.java b/src/com/android/mail/lib/html/parser/HtmlParser.java
similarity index 99%
rename from src/com/android/email/lib/html/parser/HtmlParser.java
rename to src/com/android/mail/lib/html/parser/HtmlParser.java
index 4cb7c46..a501c85 100644
--- a/src/com/android/email/lib/html/parser/HtmlParser.java
+++ b/src/com/android/mail/lib/html/parser/HtmlParser.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.lib.html.parser;
+package com.android.mail.lib.html.parser;
-import com.android.email.lib.base.CharEscapers;
-import com.android.email.lib.base.CharMatcher;
-import com.android.email.lib.base.Preconditions;
-import com.android.email.lib.base.StringUtil;
-import com.android.email.lib.base.X;
+import com.android.mail.lib.base.CharEscapers;
+import com.android.mail.lib.base.CharMatcher;
+import com.android.mail.lib.base.Preconditions;
+import com.android.mail.lib.base.StringUtil;
+import com.android.mail.lib.base.X;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.io.ByteStreams;
diff --git a/src/com/android/email/lib/html/parser/HtmlTree.java b/src/com/android/mail/lib/html/parser/HtmlTree.java
similarity index 99%
rename from src/com/android/email/lib/html/parser/HtmlTree.java
rename to src/com/android/mail/lib/html/parser/HtmlTree.java
index d16e7b7..e64a8d5 100644
--- a/src/com/android/email/lib/html/parser/HtmlTree.java
+++ b/src/com/android/mail/lib/html/parser/HtmlTree.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.lib.html.parser;
+package com.android.mail.lib.html.parser;
-import com.android.email.lib.base.CharMatcher;
-import com.android.email.lib.base.Preconditions;
-import com.android.email.lib.base.X;
+import com.android.mail.lib.base.CharMatcher;
+import com.android.mail.lib.base.Preconditions;
+import com.android.mail.lib.base.X;
import com.google.common.collect.ImmutableSet;
import java.util.ArrayList;
diff --git a/src/com/android/email/lib/html/parser/HtmlTreeBuilder.java b/src/com/android/mail/lib/html/parser/HtmlTreeBuilder.java
similarity index 98%
rename from src/com/android/email/lib/html/parser/HtmlTreeBuilder.java
rename to src/com/android/mail/lib/html/parser/HtmlTreeBuilder.java
index aaaf32c..e5d975d 100644
--- a/src/com/android/email/lib/html/parser/HtmlTreeBuilder.java
+++ b/src/com/android/mail/lib/html/parser/HtmlTreeBuilder.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.lib.html.parser;
+package com.android.mail.lib.html.parser;
-import com.android.email.lib.base.X;
-import com.android.email.lib.html.parser.HtmlDocument.EndTag;
+import com.android.mail.lib.base.X;
+import com.android.mail.lib.html.parser.HtmlDocument.EndTag;
import com.google.common.io.ByteStreams;
import java.io.IOException;
diff --git a/src/com/android/email/lib/html/parser/HtmlWhitelist.java b/src/com/android/mail/lib/html/parser/HtmlWhitelist.java
similarity index 96%
rename from src/com/android/email/lib/html/parser/HtmlWhitelist.java
rename to src/com/android/mail/lib/html/parser/HtmlWhitelist.java
index 6e13961..836633b 100644
--- a/src/com/android/email/lib/html/parser/HtmlWhitelist.java
+++ b/src/com/android/mail/lib/html/parser/HtmlWhitelist.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.lib.html.parser;
+package com.android.mail.lib.html.parser;
/**
* HtmlWhitelist is an interface that defines methods required by HtmlParser for
diff --git a/src/com/android/email/perf/EventLogTags.logtags b/src/com/android/mail/perf/EventLogTags.logtags
similarity index 100%
rename from src/com/android/email/perf/EventLogTags.logtags
rename to src/com/android/mail/perf/EventLogTags.logtags
diff --git a/src/com/android/email/perf/SimpleTimer.java b/src/com/android/mail/perf/SimpleTimer.java
similarity index 92%
rename from src/com/android/email/perf/SimpleTimer.java
rename to src/com/android/mail/perf/SimpleTimer.java
index d53c302..27263f0 100644
--- a/src/com/android/email/perf/SimpleTimer.java
+++ b/src/com/android/mail/perf/SimpleTimer.java
@@ -1,11 +1,11 @@
// Copyright 2011 Google Inc. All Rights Reserved.
-package com.android.email.perf;
+package com.android.mail.perf;
import android.os.SystemClock;
-import com.android.email.utils.LogUtils;
-import com.android.email.utils.Utils;
+import com.android.mail.utils.LogUtils;
+import com.android.mail.utils.Utils;
/**
* A simple perf timer class that supports lap-time-style measurements. Once a timer is started,
diff --git a/src/com/android/email/perf/Timer.java b/src/com/android/mail/perf/Timer.java
similarity index 98%
rename from src/com/android/email/perf/Timer.java
rename to src/com/android/mail/perf/Timer.java
index 1cdd31b..3452140 100644
--- a/src/com/android/email/perf/Timer.java
+++ b/src/com/android/mail/perf/Timer.java
@@ -1,10 +1,10 @@
// Copyright 2010 Google Inc. All Rights Reserved.
-package com.android.email.perf;
+package com.android.mail.perf;
import com.google.common.collect.Maps;
-import com.android.email.utils.LogUtils;
-import com.android.email.utils.Utils;
+import com.android.mail.utils.LogUtils;
+import com.android.mail.utils.Utils;
import android.os.Debug;
import android.os.SystemClock;
diff --git a/src/com/android/email/preferences/README b/src/com/android/mail/preferences/README
similarity index 100%
rename from src/com/android/email/preferences/README
rename to src/com/android/mail/preferences/README
diff --git a/src/com/android/email/providers/AccountCacheProvider.java b/src/com/android/mail/providers/AccountCacheProvider.java
similarity index 99%
rename from src/com/android/email/providers/AccountCacheProvider.java
rename to src/com/android/mail/providers/AccountCacheProvider.java
index 02779e1..cc6e5ac 100644
--- a/src/com/android/email/providers/AccountCacheProvider.java
+++ b/src/com/android/mail/providers/AccountCacheProvider.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.email.providers;
+package com.android.mail.providers;
import android.content.ContentProvider;
import android.content.ContentValues;
diff --git a/src/com/android/email/providers/Address.java b/src/com/android/mail/providers/Address.java
similarity index 99%
rename from src/com/android/email/providers/Address.java
rename to src/com/android/mail/providers/Address.java
index 6160fb8..f9172a3 100644
--- a/src/com/android/email/providers/Address.java
+++ b/src/com/android/mail/providers/Address.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.providers;
+package com.android.mail.providers;
import com.android.common.Rfc822Validator;
-import com.android.email.utils.LogUtils;
-import com.android.email.utils.Utils;
+import com.android.mail.utils.LogUtils;
+import com.android.mail.utils.Utils;
import com.google.common.annotations.VisibleForTesting;
import org.apache.james.mime4j.codec.EncoderUtil;
diff --git a/src/com/android/email/providers/Attachment.java b/src/com/android/mail/providers/Attachment.java
similarity index 95%
rename from src/com/android/email/providers/Attachment.java
rename to src/com/android/mail/providers/Attachment.java
index 7a8e563..3d80a60 100644
--- a/src/com/android/email/providers/Attachment.java
+++ b/src/com/android/mail/providers/Attachment.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.providers;
+package com.android.mail.providers;
public interface Attachment {
diff --git a/src/com/android/email/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
similarity index 99%
rename from src/com/android/email/providers/UIProvider.java
rename to src/com/android/mail/providers/UIProvider.java
index 632de1a..b59db0e 100644
--- a/src/com/android/email/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.email.providers;
+package com.android.mail.providers;
import android.provider.BaseColumns;
@@ -26,7 +26,7 @@
public static final long INVALID_MESSAGE_ID = -1;
// The actual content provider should define its own authority
- public static final String AUTHORITY = "com.android.email.providers";
+ public static final String AUTHORITY = "com.android.mail.providers";
public static final String ACCOUNT_LIST_TYPE =
"vnd.android.cursor.dir/vnd.com.android.mail.account";
diff --git a/src/com/android/email/providers/UIProviderValidator.java b/src/com/android/mail/providers/UIProviderValidator.java
similarity index 98%
rename from src/com/android/email/providers/UIProviderValidator.java
rename to src/com/android/mail/providers/UIProviderValidator.java
index 977647e..6fca1be 100644
--- a/src/com/android/email/providers/UIProviderValidator.java
+++ b/src/com/android/mail/providers/UIProviderValidator.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.email.providers;
+package com.android.mail.providers;
import com.google.common.collect.ImmutableSet;
diff --git a/src/com/android/email/providers/protos/exchange/ExchangeAttachment.java b/src/com/android/mail/providers/protos/exchange/ExchangeAttachment.java
similarity index 94%
rename from src/com/android/email/providers/protos/exchange/ExchangeAttachment.java
rename to src/com/android/mail/providers/protos/exchange/ExchangeAttachment.java
index d295747..8ed8ba4 100644
--- a/src/com/android/email/providers/protos/exchange/ExchangeAttachment.java
+++ b/src/com/android/mail/providers/protos/exchange/ExchangeAttachment.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.providers.protos.exchange;
+package com.android.mail.providers.protos.exchange;
-import com.android.email.providers.Attachment;
+import com.android.mail.providers.Attachment;
import java.io.Serializable;
diff --git a/src/com/android/email/providers/protos/gmail/DummyGmailProvider.java b/src/com/android/mail/providers/protos/gmail/DummyGmailProvider.java
similarity index 94%
rename from src/com/android/email/providers/protos/gmail/DummyGmailProvider.java
rename to src/com/android/mail/providers/protos/gmail/DummyGmailProvider.java
index 2e50d1e..c1d3985 100644
--- a/src/com/android/email/providers/protos/gmail/DummyGmailProvider.java
+++ b/src/com/android/mail/providers/protos/gmail/DummyGmailProvider.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.providers.protos.gmail;
+package com.android.mail.providers.protos.gmail;
import android.content.ContentProvider;
import android.content.ContentValues;
@@ -36,7 +36,7 @@
* Intent used to notify interested parties that the Mail provbider has been created.
*/
static final String ACTION_PROVIDER_CREATED
- = "com.android.email.providers.protos.gmail.intent.ACTION_PROVIDER_CREATED";
+ = "com.android.mail.providers.protos.gmail.intent.ACTION_PROVIDER_CREATED";
@Override
public boolean onCreate() {
diff --git a/src/com/android/email/providers/protos/gmail/GmailIntentReceiver.java b/src/com/android/mail/providers/protos/gmail/GmailIntentReceiver.java
similarity index 94%
rename from src/com/android/email/providers/protos/gmail/GmailIntentReceiver.java
rename to src/com/android/mail/providers/protos/gmail/GmailIntentReceiver.java
index 3676f1b..d90e814 100644
--- a/src/com/android/email/providers/protos/gmail/GmailIntentReceiver.java
+++ b/src/com/android/mail/providers/protos/gmail/GmailIntentReceiver.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.providers.protos.gmail;
+package com.android.mail.providers.protos.gmail;
import android.content.BroadcastReceiver;
import android.content.Context;
diff --git a/src/com/android/email/providers/protos/gmail/GmailIntentService.java b/src/com/android/mail/providers/protos/gmail/GmailIntentService.java
similarity index 86%
rename from src/com/android/email/providers/protos/gmail/GmailIntentService.java
rename to src/com/android/mail/providers/protos/gmail/GmailIntentService.java
index 57f2291..836cf4c 100644
--- a/src/com/android/email/providers/protos/gmail/GmailIntentService.java
+++ b/src/com/android/mail/providers/protos/gmail/GmailIntentService.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.providers.protos.gmail;
+package com.android.mail.providers.protos.gmail;
-import com.android.email.providers.AccountCacheProvider;
-import com.android.email.providers.protos.mock.MockUiProvider;
-import com.android.email.providers.UIProvider.AccountCapabilities;
-import com.android.email.providers.UIProvider.AccountColumns;
-import com.android.email.providers.UIProvider.AttachmentColumns;
-import com.android.email.providers.UIProvider.ConversationColumns;
-import com.android.email.providers.UIProvider.FolderCapabilities;
-import com.android.email.providers.UIProvider.FolderColumns;
-import com.android.email.providers.UIProvider.MessageColumns;
+import com.android.mail.providers.AccountCacheProvider;
+import com.android.mail.providers.protos.mock.MockUiProvider;
+import com.android.mail.providers.UIProvider.AccountCapabilities;
+import com.android.mail.providers.UIProvider.AccountColumns;
+import com.android.mail.providers.UIProvider.AttachmentColumns;
+import com.android.mail.providers.UIProvider.ConversationColumns;
+import com.android.mail.providers.UIProvider.FolderCapabilities;
+import com.android.mail.providers.UIProvider.FolderColumns;
+import com.android.mail.providers.UIProvider.MessageColumns;
import android.accounts.Account;
import android.accounts.AccountManager;
diff --git a/src/com/android/email/providers/protos/gmail/README b/src/com/android/mail/providers/protos/gmail/README
similarity index 100%
rename from src/com/android/email/providers/protos/gmail/README
rename to src/com/android/mail/providers/protos/gmail/README
diff --git a/src/com/android/email/providers/protos/imap/README b/src/com/android/mail/providers/protos/imap/README
similarity index 100%
rename from src/com/android/email/providers/protos/imap/README
rename to src/com/android/mail/providers/protos/imap/README
diff --git a/src/com/android/email/providers/protos/mock/MockAttachment.java b/src/com/android/mail/providers/protos/mock/MockAttachment.java
similarity index 95%
rename from src/com/android/email/providers/protos/mock/MockAttachment.java
rename to src/com/android/mail/providers/protos/mock/MockAttachment.java
index f9437fd..34f76ba 100644
--- a/src/com/android/email/providers/protos/mock/MockAttachment.java
+++ b/src/com/android/mail/providers/protos/mock/MockAttachment.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.providers.protos.mock;
+package com.android.mail.providers.protos.mock;
import android.net.Uri;
-import com.android.email.providers.Attachment;
+import com.android.mail.providers.Attachment;
import java.io.Serializable;
diff --git a/src/com/android/email/providers/protos/mock/MockUiProvider.java b/src/com/android/mail/providers/protos/mock/MockUiProvider.java
similarity index 96%
rename from src/com/android/email/providers/protos/mock/MockUiProvider.java
rename to src/com/android/mail/providers/protos/mock/MockUiProvider.java
index 8b41300..f10191f 100644
--- a/src/com/android/email/providers/protos/mock/MockUiProvider.java
+++ b/src/com/android/mail/providers/protos/mock/MockUiProvider.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package com.android.email.providers.protos.mock;
+package com.android.mail.providers.protos.mock;
-import com.android.email.providers.AccountCacheProvider;
-import com.android.email.providers.UIProvider.AccountCapabilities;
-import com.android.email.providers.UIProvider.AccountColumns;
-import com.android.email.providers.UIProvider.AttachmentColumns;
-import com.android.email.providers.UIProvider.ConversationColumns;
-import com.android.email.providers.UIProvider.FolderCapabilities;
-import com.android.email.providers.UIProvider.FolderColumns;
-import com.android.email.providers.UIProvider.MessageColumns;
+import com.android.mail.providers.AccountCacheProvider;
+import com.android.mail.providers.UIProvider.AccountCapabilities;
+import com.android.mail.providers.UIProvider.AccountColumns;
+import com.android.mail.providers.UIProvider.AttachmentColumns;
+import com.android.mail.providers.UIProvider.ConversationColumns;
+import com.android.mail.providers.UIProvider.FolderCapabilities;
+import com.android.mail.providers.UIProvider.FolderColumns;
+import com.android.mail.providers.UIProvider.MessageColumns;
import android.content.ContentProvider;
import android.content.ContentValues;
diff --git a/src/com/android/email/providers/protos/pop/README b/src/com/android/mail/providers/protos/pop/README
similarity index 100%
rename from src/com/android/email/providers/protos/pop/README
rename to src/com/android/mail/providers/protos/pop/README
diff --git a/src/com/android/email/utils/AccountUtils.java b/src/com/android/mail/utils/AccountUtils.java
similarity index 95%
rename from src/com/android/email/utils/AccountUtils.java
rename to src/com/android/mail/utils/AccountUtils.java
index deea1b1..6f027b3 100644
--- a/src/com/android/email/utils/AccountUtils.java
+++ b/src/com/android/mail/utils/AccountUtils.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.utils;
+package com.android.mail.utils;
-import com.android.email.providers.AccountCacheProvider;
-import com.android.email.providers.UIProvider;
+import com.android.mail.providers.AccountCacheProvider;
+import com.android.mail.providers.UIProvider;
import android.accounts.Account;
import android.accounts.AccountManagerCallback;
diff --git a/src/com/android/email/utils/AttachmentUtils.java b/src/com/android/mail/utils/AttachmentUtils.java
similarity index 95%
rename from src/com/android/email/utils/AttachmentUtils.java
rename to src/com/android/mail/utils/AttachmentUtils.java
index d115740..ad7714e 100644
--- a/src/com/android/email/utils/AttachmentUtils.java
+++ b/src/com/android/mail/utils/AttachmentUtils.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.utils;
+package com.android.mail.utils;
import android.content.Context;
-import com.android.email.R;
+import com.android.mail.R;
import java.text.DecimalFormat;
diff --git a/src/com/android/email/utils/LogUtils.java b/src/com/android/mail/utils/LogUtils.java
similarity index 99%
rename from src/com/android/email/utils/LogUtils.java
rename to src/com/android/mail/utils/LogUtils.java
index 3ca7961..8513243 100644
--- a/src/com/android/email/utils/LogUtils.java
+++ b/src/com/android/mail/utils/LogUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.utils;
+package com.android.mail.utils;
import android.net.Uri;
import android.util.Log;
diff --git a/src/com/android/email/utils/LoggingInputStream.java b/src/com/android/mail/utils/LoggingInputStream.java
similarity index 98%
rename from src/com/android/email/utils/LoggingInputStream.java
rename to src/com/android/mail/utils/LoggingInputStream.java
index d792466..55987f4 100644
--- a/src/com/android/email/utils/LoggingInputStream.java
+++ b/src/com/android/mail/utils/LoggingInputStream.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.email.utils;
+package com.android.mail.utils;
import android.util.Log;
diff --git a/src/com/android/email/utils/MimeType.java b/src/com/android/mail/utils/MimeType.java
similarity index 99%
rename from src/com/android/email/utils/MimeType.java
rename to src/com/android/mail/utils/MimeType.java
index b27c300..f88b262 100644
--- a/src/com/android/email/utils/MimeType.java
+++ b/src/com/android/mail/utils/MimeType.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.utils;
+package com.android.mail.utils;
import android.text.TextUtils;
import android.webkit.MimeTypeMap;
diff --git a/src/com/android/email/utils/Utils.java b/src/com/android/mail/utils/Utils.java
similarity index 99%
rename from src/com/android/email/utils/Utils.java
rename to src/com/android/mail/utils/Utils.java
index f74bf8d..871172a 100644
--- a/src/com/android/email/utils/Utils.java
+++ b/src/com/android/mail/utils/Utils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.email.utils;
+package com.android.mail.utils;
import android.content.Context;
import android.content.res.Resources;
@@ -34,7 +34,7 @@
import android.webkit.WebSettings;
import android.webkit.WebView;
-import com.android.email.R;
+import com.android.mail.R;
import com.google.common.collect.Maps;
import java.util.Map;
diff --git a/src/com/android/email/widget/README b/src/com/android/mail/widget/README
similarity index 100%
rename from src/com/android/email/widget/README
rename to src/com/android/mail/widget/README
diff --git a/src/org/apache/james/mime4j/Log.java b/src/org/apache/james/mime4j/Log.java
index ca1fc76..d80c741 100644
--- a/src/org/apache/james/mime4j/Log.java
+++ b/src/org/apache/james/mime4j/Log.java
@@ -16,7 +16,7 @@
package org.apache.james.mime4j;
-import com.android.email.utils.LogUtils;
+import com.android.mail.utils.LogUtils;
/**
* Empty stub for the apache logging library.
diff --git a/src/org/apache/james/mime4j/MimeStreamParser.java b/src/org/apache/james/mime4j/MimeStreamParser.java
index c4c53d7..e8045e9 100644
--- a/src/org/apache/james/mime4j/MimeStreamParser.java
+++ b/src/org/apache/james/mime4j/MimeStreamParser.java
@@ -19,7 +19,7 @@
package org.apache.james.mime4j;
-import com.android.email.utils.LoggingInputStream;
+import com.android.mail.utils.LoggingInputStream;
import org.apache.james.mime4j.decoder.Base64InputStream;
import org.apache.james.mime4j.decoder.QuotedPrintableInputStream;
diff --git a/src/org/apache/james/mime4j/field/DateTimeField.java b/src/org/apache/james/mime4j/field/DateTimeField.java
index 7f8bf19..21b0c33 100644
--- a/src/org/apache/james/mime4j/field/DateTimeField.java
+++ b/src/org/apache/james/mime4j/field/DateTimeField.java
@@ -21,7 +21,7 @@
//BEGIN android-changed: Stubbing out logging
-import com.android.email.utils.Utils;
+import com.android.mail.utils.Utils;
import org.apache.james.mime4j.Log;
import org.apache.james.mime4j.LogFactory;
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 4646465..7964930 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.email.emailtests">
+ package="com.android.mail.emailtests">
<!-- We add an application tag here just so that we can indicate that
this package needs to link against the android.test library,
@@ -40,7 +40,7 @@
"adb shell am instrument -w com.google.android.gmtests/android.test.InstrumentationTestRunner"
-->
<instrumentation android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="com.android.email"
+ android:targetPackage="com.android.mail"
android:label="Tests for Email."/>
</manifest>
diff --git a/tests/src/com/android/email/providers/AddressTests.java b/tests/src/com/android/mail/providers/AddressTests.java
similarity index 95%
rename from tests/src/com/android/email/providers/AddressTests.java
rename to tests/src/com/android/mail/providers/AddressTests.java
index a6abd62..01bd173 100644
--- a/tests/src/com/android/email/providers/AddressTests.java
+++ b/tests/src/com/android/mail/providers/AddressTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.email.providers;
+package com.android.mail.providers;
import android.test.AndroidTestCase;
diff --git a/tests/src/com/android/email/providers/protos/mock/MockUiProviderTests.java b/tests/src/com/android/mail/providers/protos/mock/MockUiProviderTests.java
similarity index 98%
rename from tests/src/com/android/email/providers/protos/mock/MockUiProviderTests.java
rename to tests/src/com/android/mail/providers/protos/mock/MockUiProviderTests.java
index cd4a76f..8e11684 100644
--- a/tests/src/com/android/email/providers/protos/mock/MockUiProviderTests.java
+++ b/tests/src/com/android/mail/providers/protos/mock/MockUiProviderTests.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.email.providers.protos.mock;
+package com.android.mail.providers.protos.mock;
-import com.android.email.providers.UIProvider;
-import com.android.email.utils.LogUtils;
+import com.android.mail.providers.UIProvider;
+import com.android.mail.utils.LogUtils;
import android.content.ContentResolver;
import android.database.Cursor;