Renaming a couple of packages
Change-Id: I2c0f86b51baa622df629206f8b79ef1d0df09119
diff --git a/res/layout-xlarge/aggregation_suggestions_item.xml b/res/layout-xlarge/aggregation_suggestions_item.xml
index 642b865..f12c608 100644
--- a/res/layout-xlarge/aggregation_suggestions_item.xml
+++ b/res/layout-xlarge/aggregation_suggestions_item.xml
@@ -18,7 +18,7 @@
-->
<view xmlns:android="http://schemas.android.com/apk/res/android"
- class="com.android.contacts.views.editor.AggregationSuggestionView"
+ class="com.android.contacts.editor.AggregationSuggestionView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
diff --git a/res/layout-xlarge/contact_detail_fragment.xml b/res/layout-xlarge/contact_detail_fragment.xml
index 6f2714e..4bc2a04 100644
--- a/res/layout-xlarge/contact_detail_fragment.xml
+++ b/res/layout-xlarge/contact_detail_fragment.xml
@@ -28,7 +28,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
- <com.android.contacts.views.detail.ContactDetailHeaderView
+ <com.android.contacts.detail.ContactDetailHeaderView
android:id="@+id/contact_header_widget"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout-xlarge/contact_editor_activity.xml b/res/layout-xlarge/contact_editor_activity.xml
index 61c526f..c146515 100644
--- a/res/layout-xlarge/contact_editor_activity.xml
+++ b/res/layout-xlarge/contact_editor_activity.xml
@@ -23,7 +23,7 @@
<com.android.contacts.widget.InterpolatingLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
- <fragment class="com.android.contacts.views.editor.ContactEditorFragment"
+ <fragment class="com.android.contacts.editor.ContactEditorFragment"
android:id="@+id/contact_editor_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout-xlarge/item_group_membership.xml b/res/layout-xlarge/item_group_membership.xml
index 196e767..c5f0dcf 100644
--- a/res/layout-xlarge/item_group_membership.xml
+++ b/res/layout-xlarge/item_group_membership.xml
@@ -16,7 +16,7 @@
<!-- the body surrounding all editors for a specific kind -->
-<com.android.contacts.views.editor.GroupMembershipView
+<com.android.contacts.editor.GroupMembershipView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -65,4 +65,4 @@
android:src="@drawable/ic_menu_remove_field_holo_light"
android:background="@null"
android:visibility="invisible" />
-</com.android.contacts.views.editor.GroupMembershipView>
+</com.android.contacts.editor.GroupMembershipView>
diff --git a/res/layout-xlarge/item_kind_section.xml b/res/layout-xlarge/item_kind_section.xml
index ac6245c..0d44af6 100644
--- a/res/layout-xlarge/item_kind_section.xml
+++ b/res/layout-xlarge/item_kind_section.xml
@@ -16,7 +16,7 @@
<!-- the body surrounding all editors for a specific kind -->
-<com.android.contacts.views.editor.KindSectionView
+<com.android.contacts.editor.KindSectionView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -51,4 +51,4 @@
android:background="?android:attr/selectableItemBackground"
android:src="@drawable/ic_menu_add_field_holo_light"
android:contentDescription="@string/description_plus_button" />
-</com.android.contacts.views.editor.KindSectionView>
+</com.android.contacts.editor.KindSectionView>
diff --git a/res/layout-xlarge/raw_contact_editor_view.xml b/res/layout-xlarge/raw_contact_editor_view.xml
index a65e602..07731fc 100644
--- a/res/layout-xlarge/raw_contact_editor_view.xml
+++ b/res/layout-xlarge/raw_contact_editor_view.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.contacts.views.editor.RawContactEditorView
+<com.android.contacts.editor.RawContactEditorView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:ex="http://schemas.android.com/apk/res/com.android.contacts"
android:layout_width="match_parent"
@@ -53,7 +53,7 @@
ex:layout_narrowRightMargin="15dip"
>
- <com.android.contacts.views.editor.TextFieldsEditorView
+ <com.android.contacts.editor.TextFieldsEditorView
android:id="@+id/edit_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -104,4 +104,4 @@
android:background="?android:attr/listDivider"
/>
</LinearLayout>
-</com.android.contacts.views.editor.RawContactEditorView>
+</com.android.contacts.editor.RawContactEditorView>
diff --git a/res/layout-xlarge/read_only_raw_contact_editor_view.xml b/res/layout-xlarge/read_only_raw_contact_editor_view.xml
index f91789d..f8edf32 100644
--- a/res/layout-xlarge/read_only_raw_contact_editor_view.xml
+++ b/res/layout-xlarge/read_only_raw_contact_editor_view.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.contacts.views.editor.ReadOnlyRawContactEditorView
+<com.android.contacts.editor.ReadOnlyRawContactEditorView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:ex="http://schemas.android.com/apk/res/com.android.contacts"
android:layout_width="match_parent"
@@ -91,4 +91,4 @@
</LinearLayout>
</com.android.contacts.widget.InterpolatingLayout>
</LinearLayout>
-</com.android.contacts.views.editor.ReadOnlyRawContactEditorView>
+</com.android.contacts.editor.ReadOnlyRawContactEditorView>
diff --git a/res/layout/aggregation_suggestions_item.xml b/res/layout/aggregation_suggestions_item.xml
index cd27e2b..f2477cb 100644
--- a/res/layout/aggregation_suggestions_item.xml
+++ b/res/layout/aggregation_suggestions_item.xml
@@ -18,7 +18,7 @@
-->
<view xmlns:android="http://schemas.android.com/apk/res/android"
- class="com.android.contacts.views.editor.AggregationSuggestionView"
+ class="com.android.contacts.editor.AggregationSuggestionView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
diff --git a/res/layout/contact_detail_activity.xml b/res/layout/contact_detail_activity.xml
index ab5ec69..9408f89 100644
--- a/res/layout/contact_detail_activity.xml
+++ b/res/layout/contact_detail_activity.xml
@@ -18,7 +18,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <fragment class="com.android.contacts.views.detail.ContactDetailFragment"
+ <fragment class="com.android.contacts.detail.ContactDetailFragment"
android:id="@+id/contact_detail_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
diff --git a/res/layout/contact_detail_fragment.xml b/res/layout/contact_detail_fragment.xml
index 6110ad3..90a075a 100644
--- a/res/layout/contact_detail_fragment.xml
+++ b/res/layout/contact_detail_fragment.xml
@@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <com.android.contacts.views.detail.ContactDetailHeaderView
+ <com.android.contacts.detail.ContactDetailHeaderView
android:id="@+id/contact_header_widget"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
diff --git a/res/layout/contact_editor_activity.xml b/res/layout/contact_editor_activity.xml
index e51869b..630e82c 100644
--- a/res/layout/contact_editor_activity.xml
+++ b/res/layout/contact_editor_activity.xml
@@ -18,7 +18,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <fragment class="com.android.contacts.views.editor.ContactEditorFragment"
+ <fragment class="com.android.contacts.editor.ContactEditorFragment"
android:id="@+id/contact_editor_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
diff --git a/res/layout/item_group_membership.xml b/res/layout/item_group_membership.xml
index 3e4db8c..65730d4 100644
--- a/res/layout/item_group_membership.xml
+++ b/res/layout/item_group_membership.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.contacts.views.editor.GroupMembershipView
+<com.android.contacts.editor.GroupMembershipView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -63,4 +63,4 @@
android:gravity="left"
/>
-</com.android.contacts.views.editor.GroupMembershipView>
+</com.android.contacts.editor.GroupMembershipView>
diff --git a/res/layout/item_kind_section.xml b/res/layout/item_kind_section.xml
index 80cf34d..fdb55c9 100644
--- a/res/layout/item_kind_section.xml
+++ b/res/layout/item_kind_section.xml
@@ -16,7 +16,7 @@
<!-- the body surrounding all editors for a specific kind -->
-<com.android.contacts.views.editor.KindSectionView
+<com.android.contacts.editor.KindSectionView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -75,4 +75,4 @@
android:paddingBottom="6dip"
android:orientation="vertical" />
-</com.android.contacts.views.editor.KindSectionView>
+</com.android.contacts.editor.KindSectionView>
diff --git a/res/layout/item_photo_editor.xml b/res/layout/item_photo_editor.xml
index 3b816b8..642908e 100644
--- a/res/layout/item_photo_editor.xml
+++ b/res/layout/item_photo_editor.xml
@@ -15,7 +15,7 @@
-->
<view
- class="com.android.contacts.views.editor.PhotoEditorView"
+ class="com.android.contacts.editor.PhotoEditorView"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/edit_photo_size"
android:layout_height="@dimen/edit_photo_size"
diff --git a/res/layout/raw_contact_editor_view.xml b/res/layout/raw_contact_editor_view.xml
index 671d3be..62d904f 100644
--- a/res/layout/raw_contact_editor_view.xml
+++ b/res/layout/raw_contact_editor_view.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.contacts.views.editor.RawContactEditorView
+<com.android.contacts.editor.RawContactEditorView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -96,7 +96,7 @@
</FrameLayout>
- <com.android.contacts.views.editor.TextFieldsEditorView
+ <com.android.contacts.editor.TextFieldsEditorView
android:id="@+id/edit_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -135,4 +135,4 @@
android:layout_marginTop="10dip"
/>
</LinearLayout>
-</com.android.contacts.views.editor.RawContactEditorView>
+</com.android.contacts.editor.RawContactEditorView>
diff --git a/res/layout/read_only_raw_contact_editor_view.xml b/res/layout/read_only_raw_contact_editor_view.xml
index eb8ec7f..f5075a3 100644
--- a/res/layout/read_only_raw_contact_editor_view.xml
+++ b/res/layout/read_only_raw_contact_editor_view.xml
@@ -15,7 +15,7 @@
-->
<!-- placed inside act_edit as tabcontent -->
-<com.android.contacts.views.editor.ReadOnlyRawContactEditorView
+<com.android.contacts.editor.ReadOnlyRawContactEditorView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -150,4 +150,4 @@
/>
</LinearLayout>
-</com.android.contacts.views.editor.ReadOnlyRawContactEditorView>
+</com.android.contacts.editor.ReadOnlyRawContactEditorView>
diff --git a/src/com/android/contacts/views/ContactLoader.java b/src/com/android/contacts/ContactLoader.java
similarity index 99%
rename from src/com/android/contacts/views/ContactLoader.java
rename to src/com/android/contacts/ContactLoader.java
index b3001a2..7ceef91 100644
--- a/src/com/android/contacts/views/ContactLoader.java
+++ b/src/com/android/contacts/ContactLoader.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.views;
+package com.android.contacts;
import com.android.contacts.util.DataStatus;
diff --git a/src/com/android/contacts/views/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
similarity index 99%
rename from src/com/android/contacts/views/ContactSaveService.java
rename to src/com/android/contacts/ContactSaveService.java
index 78aa428..a926c78 100644
--- a/src/com/android/contacts/views/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.views;
+package com.android.contacts;
import com.android.contacts.R;
import com.google.android.collect.Lists;
@@ -48,6 +48,9 @@
import java.util.HashSet;
import java.util.List;
+/**
+ * A service responsible for saving changes to the content provider.
+ */
public class ContactSaveService extends IntentService {
private static final String TAG = "ContactSaveService";
diff --git a/src/com/android/contacts/views/GroupMetaData.java b/src/com/android/contacts/GroupMetaData.java
similarity index 93%
rename from src/com/android/contacts/views/GroupMetaData.java
rename to src/com/android/contacts/GroupMetaData.java
index dd52eb0..39e955d 100644
--- a/src/com/android/contacts/views/GroupMetaData.java
+++ b/src/com/android/contacts/GroupMetaData.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License
*/
-package com.android.contacts.views;
+package com.android.contacts;
/**
* Meta-data for a contact group. We load all groups associated with the contact's
@@ -29,6 +29,8 @@
public GroupMetaData(String accountName, String accountType, long groupId, String title,
boolean defaultGroup, boolean favorites) {
+ this.mAccountName = accountName;
+ this.mAccountType = accountType;
this.mGroupId = groupId;
this.mTitle = title;
this.mDefaultGroup = defaultGroup;
@@ -58,4 +60,4 @@
public boolean isFavorites() {
return mFavorites;
}
-}
+}
\ No newline at end of file
diff --git a/src/com/android/contacts/views/GroupMetaDataLoader.java b/src/com/android/contacts/GroupMetaDataLoader.java
similarity index 97%
rename from src/com/android/contacts/views/GroupMetaDataLoader.java
rename to src/com/android/contacts/GroupMetaDataLoader.java
index d22b27b..d08d007 100644
--- a/src/com/android/contacts/views/GroupMetaDataLoader.java
+++ b/src/com/android/contacts/GroupMetaDataLoader.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License
*/
-package com.android.contacts.views;
+package com.android.contacts;
import android.content.Context;
import android.content.CursorLoader;
diff --git a/src/com/android/contacts/activities/ContactBrowserActivity.java b/src/com/android/contacts/activities/ContactBrowserActivity.java
index 533eb85..eac018c 100644
--- a/src/com/android/contacts/activities/ContactBrowserActivity.java
+++ b/src/com/android/contacts/activities/ContactBrowserActivity.java
@@ -16,7 +16,9 @@
package com.android.contacts.activities;
+import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
+import com.android.contacts.detail.ContactDetailFragment;
import com.android.contacts.interactions.ContactDeletionInteraction;
import com.android.contacts.interactions.GroupDeletionDialogFragment;
import com.android.contacts.interactions.GroupRenamingDialogFragment;
@@ -43,8 +45,6 @@
import com.android.contacts.util.AccountSelectionUtil;
import com.android.contacts.util.AccountsListAdapter;
import com.android.contacts.util.DialogManager;
-import com.android.contacts.views.ContactSaveService;
-import com.android.contacts.views.detail.ContactDetailFragment;
import com.android.contacts.widget.ContextMenuAdapter;
import android.accounts.Account;
diff --git a/src/com/android/contacts/activities/ContactDetailActivity.java b/src/com/android/contacts/activities/ContactDetailActivity.java
index 9091328..7a3a3b9 100644
--- a/src/com/android/contacts/activities/ContactDetailActivity.java
+++ b/src/com/android/contacts/activities/ContactDetailActivity.java
@@ -16,11 +16,11 @@
package com.android.contacts.activities;
+import com.android.contacts.ContactSaveService;
import com.android.contacts.ContactsSearchManager;
import com.android.contacts.R;
+import com.android.contacts.detail.ContactDetailFragment;
import com.android.contacts.interactions.ContactDeletionInteraction;
-import com.android.contacts.views.ContactSaveService;
-import com.android.contacts.views.detail.ContactDetailFragment;
import android.accounts.Account;
import android.app.Activity;
diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java
index f68782a..0998ebb 100644
--- a/src/com/android/contacts/activities/ContactEditorActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorActivity.java
@@ -18,10 +18,10 @@
import com.android.contacts.ContactsSearchManager;
import com.android.contacts.R;
+import com.android.contacts.editor.ContactEditorFragment;
+import com.android.contacts.editor.ContactEditorFragment.SaveMode;
import com.android.contacts.interactions.ContactDeletionInteraction;
import com.android.contacts.util.DialogManager;
-import com.android.contacts.views.editor.ContactEditorFragment;
-import com.android.contacts.views.editor.ContactEditorFragment.SaveMode;
import android.app.ActionBar;
import android.app.Activity;
diff --git a/src/com/android/contacts/views/detail/ContactDetailFragment.java b/src/com/android/contacts/detail/ContactDetailFragment.java
similarity index 98%
rename from src/com/android/contacts/views/detail/ContactDetailFragment.java
rename to src/com/android/contacts/detail/ContactDetailFragment.java
index 3607923..18c6b6d 100644
--- a/src/com/android/contacts/views/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/detail/ContactDetailFragment.java
@@ -14,28 +14,27 @@
* limitations under the License
*/
-package com.android.contacts.views.detail;
+package com.android.contacts.detail;
import com.android.contacts.Collapser;
import com.android.contacts.Collapser.Collapsible;
+import com.android.contacts.ContactLoader;
import com.android.contacts.ContactOptionsActivity;
import com.android.contacts.ContactPresenceIconUtil;
import com.android.contacts.ContactsUtils;
import com.android.contacts.ContactsUtils.ImActions;
+import com.android.contacts.GroupMetaData;
import com.android.contacts.R;
import com.android.contacts.TypePrecedence;
-import com.android.contacts.model.AccountTypes;
+import com.android.contacts.editor.SelectAccountDialogFragment;
import com.android.contacts.model.AccountType;
import com.android.contacts.model.AccountType.DataKind;
import com.android.contacts.model.AccountType.EditType;
+import com.android.contacts.model.AccountTypes;
import com.android.contacts.util.Constants;
import com.android.contacts.util.DataStatus;
import com.android.contacts.util.DateUtils;
import com.android.contacts.util.PhoneCapabilityTester;
-import com.android.contacts.views.ContactLoader;
-import com.android.contacts.views.ContactSaveService;
-import com.android.contacts.views.GroupMetaData;
-import com.android.contacts.views.editor.SelectAccountDialogFragment;
import com.android.contacts.widget.TransitionAnimationView;
import com.android.internal.telephony.ITelephony;
@@ -60,7 +59,6 @@
import android.os.Bundle;
import android.os.RemoteException;
import android.os.ServiceManager;
-import android.provider.ContactsContract.CommonDataKinds;
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.CommonDataKinds.Event;
import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
@@ -84,8 +82,6 @@
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
import android.util.Log;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Menu;
diff --git a/src/com/android/contacts/views/detail/ContactDetailHeaderView.java b/src/com/android/contacts/detail/ContactDetailHeaderView.java
similarity index 97%
rename from src/com/android/contacts/views/detail/ContactDetailHeaderView.java
rename to src/com/android/contacts/detail/ContactDetailHeaderView.java
index 942cbaa..98f24f5 100644
--- a/src/com/android/contacts/views/detail/ContactDetailHeaderView.java
+++ b/src/com/android/contacts/detail/ContactDetailHeaderView.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.android.contacts.views.detail;
+package com.android.contacts.detail;
+import com.android.contacts.ContactLoader;
+import com.android.contacts.ContactLoader.Result;
+import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
import com.android.contacts.util.ContactBadgeUtil;
-import com.android.contacts.views.ContactLoader;
-import com.android.contacts.views.ContactLoader.Result;
-import com.android.contacts.views.ContactSaveService;
import android.content.ContentValues;
import android.content.Context;
@@ -47,7 +47,7 @@
/**
* Header for displaying a title bar with contact info. You
* can bind specific values by calling
- * {@link ContactDetailHeaderView#loadData(com.android.contacts.views.ContactLoader.Result)}
+ * {@link ContactDetailHeaderView#loadData(com.android.contacts.ContactLoader.Result)}
*/
public class ContactDetailHeaderView extends FrameLayout implements View.OnClickListener {
private static final String TAG = "ContactDetailHeaderView";
diff --git a/src/com/android/contacts/views/editor/AggregationSuggestionEngine.java b/src/com/android/contacts/editor/AggregationSuggestionEngine.java
similarity index 99%
rename from src/com/android/contacts/views/editor/AggregationSuggestionEngine.java
rename to src/com/android/contacts/editor/AggregationSuggestionEngine.java
index 79131d6..477c149 100644
--- a/src/com/android/contacts/views/editor/AggregationSuggestionEngine.java
+++ b/src/com/android/contacts/editor/AggregationSuggestionEngine.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
import com.android.contacts.model.EntityDelta.ValuesDelta;
import com.google.android.collect.Lists;
diff --git a/src/com/android/contacts/views/editor/AggregationSuggestionView.java b/src/com/android/contacts/editor/AggregationSuggestionView.java
similarity index 95%
rename from src/com/android/contacts/views/editor/AggregationSuggestionView.java
rename to src/com/android/contacts/editor/AggregationSuggestionView.java
index ae703ac..19bf299 100644
--- a/src/com/android/contacts/views/editor/AggregationSuggestionView.java
+++ b/src/com/android/contacts/editor/AggregationSuggestionView.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
import com.android.contacts.R;
-import com.android.contacts.model.AccountTypes;
+import com.android.contacts.editor.AggregationSuggestionEngine.RawContact;
+import com.android.contacts.editor.AggregationSuggestionEngine.Suggestion;
import com.android.contacts.model.AccountType;
-import com.android.contacts.views.editor.AggregationSuggestionEngine.RawContact;
-import com.android.contacts.views.editor.AggregationSuggestionEngine.Suggestion;
+import com.android.contacts.model.AccountTypes;
import com.google.android.collect.Lists;
import android.content.Context;
diff --git a/src/com/android/contacts/views/editor/BaseRawContactEditorView.java b/src/com/android/contacts/editor/BaseRawContactEditorView.java
similarity index 98%
rename from src/com/android/contacts/views/editor/BaseRawContactEditorView.java
rename to src/com/android/contacts/editor/BaseRawContactEditorView.java
index 52c9a29..381a8aa 100644
--- a/src/com/android/contacts/views/editor/BaseRawContactEditorView.java
+++ b/src/com/android/contacts/editor/BaseRawContactEditorView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
import com.android.contacts.R;
import com.android.contacts.model.AccountType;
diff --git a/src/com/android/contacts/views/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
similarity index 99%
rename from src/com/android/contacts/views/editor/ContactEditorFragment.java
rename to src/com/android/contacts/editor/ContactEditorFragment.java
index e117dc1..74867c1 100644
--- a/src/com/android/contacts/views/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -14,11 +14,16 @@
* limitations under the License
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
+import com.android.contacts.ContactLoader;
+import com.android.contacts.ContactSaveService;
+import com.android.contacts.GroupMetaDataLoader;
import com.android.contacts.R;
import com.android.contacts.activities.ContactEditorActivity;
import com.android.contacts.activities.JoinContactActivity;
+import com.android.contacts.editor.AggregationSuggestionEngine.Suggestion;
+import com.android.contacts.editor.Editor.EditorListener;
import com.android.contacts.model.AccountType;
import com.android.contacts.model.AccountTypes;
import com.android.contacts.model.EntityDelta;
@@ -28,11 +33,6 @@
import com.android.contacts.model.GoogleAccountType;
import com.android.contacts.util.EmptyService;
import com.android.contacts.util.WeakAsyncTask;
-import com.android.contacts.views.ContactLoader;
-import com.android.contacts.views.ContactSaveService;
-import com.android.contacts.views.GroupMetaDataLoader;
-import com.android.contacts.views.editor.AggregationSuggestionEngine.Suggestion;
-import com.android.contacts.views.editor.Editor.EditorListener;
import android.accounts.Account;
import android.app.Activity;
diff --git a/src/com/android/contacts/views/editor/Editor.java b/src/com/android/contacts/editor/Editor.java
similarity index 98%
rename from src/com/android/contacts/views/editor/Editor.java
rename to src/com/android/contacts/editor/Editor.java
index 1d60e74..d733e68 100644
--- a/src/com/android/contacts/views/editor/Editor.java
+++ b/src/com/android/contacts/editor/Editor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
import com.android.contacts.model.EntityDelta;
import com.android.contacts.model.AccountType.DataKind;
diff --git a/src/com/android/contacts/views/editor/EventFieldEditorView.java b/src/com/android/contacts/editor/EventFieldEditorView.java
similarity index 99%
rename from src/com/android/contacts/views/editor/EventFieldEditorView.java
rename to src/com/android/contacts/editor/EventFieldEditorView.java
index a79b374..0c594da 100644
--- a/src/com/android/contacts/views/editor/EventFieldEditorView.java
+++ b/src/com/android/contacts/editor/EventFieldEditorView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
import com.android.contacts.R;
import com.android.contacts.datepicker.DatePicker;
diff --git a/src/com/android/contacts/views/editor/GroupMembershipView.java b/src/com/android/contacts/editor/GroupMembershipView.java
similarity index 98%
rename from src/com/android/contacts/views/editor/GroupMembershipView.java
rename to src/com/android/contacts/editor/GroupMembershipView.java
index 5705561..c4801ab 100644
--- a/src/com/android/contacts/views/editor/GroupMembershipView.java
+++ b/src/com/android/contacts/editor/GroupMembershipView.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
+import com.android.contacts.GroupMetaDataLoader;
import com.android.contacts.R;
import com.android.contacts.interactions.GroupCreationDialogFragment;
import com.android.contacts.model.AccountType.DataKind;
import com.android.contacts.model.EntityDelta;
import com.android.contacts.model.EntityDelta.ValuesDelta;
import com.android.contacts.model.EntityModifier;
-import com.android.contacts.views.GroupMetaDataLoader;
import android.app.Activity;
import android.content.Context;
diff --git a/src/com/android/contacts/views/editor/KindSectionView.java b/src/com/android/contacts/editor/KindSectionView.java
similarity index 98%
rename from src/com/android/contacts/views/editor/KindSectionView.java
rename to src/com/android/contacts/editor/KindSectionView.java
index 75bae24..d06d321 100644
--- a/src/com/android/contacts/views/editor/KindSectionView.java
+++ b/src/com/android/contacts/editor/KindSectionView.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
import com.android.contacts.R;
+import com.android.contacts.editor.Editor.EditorListener;
import com.android.contacts.model.AccountType.DataKind;
import com.android.contacts.model.EntityDelta;
import com.android.contacts.model.EntityDelta.ValuesDelta;
import com.android.contacts.model.EntityModifier;
-import com.android.contacts.views.editor.Editor.EditorListener;
import android.content.Context;
import android.os.Handler;
diff --git a/src/com/android/contacts/views/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java
similarity index 99%
rename from src/com/android/contacts/views/editor/LabeledEditorView.java
rename to src/com/android/contacts/editor/LabeledEditorView.java
index 86ed65e..92cb12f 100644
--- a/src/com/android/contacts/views/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/editor/LabeledEditorView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
import com.android.contacts.ContactsUtils;
import com.android.contacts.R;
diff --git a/src/com/android/contacts/views/editor/PhotoActionPopup.java b/src/com/android/contacts/editor/PhotoActionPopup.java
similarity index 98%
rename from src/com/android/contacts/views/editor/PhotoActionPopup.java
rename to src/com/android/contacts/editor/PhotoActionPopup.java
index 2dba00c..ae76afe 100644
--- a/src/com/android/contacts/views/editor/PhotoActionPopup.java
+++ b/src/com/android/contacts/editor/PhotoActionPopup.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
import com.android.contacts.R;
diff --git a/src/com/android/contacts/views/editor/PhotoEditorView.java b/src/com/android/contacts/editor/PhotoEditorView.java
similarity index 98%
rename from src/com/android/contacts/views/editor/PhotoEditorView.java
rename to src/com/android/contacts/editor/PhotoEditorView.java
index 05cd5fd..47e7593 100644
--- a/src/com/android/contacts/views/editor/PhotoEditorView.java
+++ b/src/com/android/contacts/editor/PhotoEditorView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
import com.android.contacts.R;
import com.android.contacts.model.EntityDelta;
diff --git a/src/com/android/contacts/views/editor/RawContactEditorView.java b/src/com/android/contacts/editor/RawContactEditorView.java
similarity index 98%
rename from src/com/android/contacts/views/editor/RawContactEditorView.java
rename to src/com/android/contacts/editor/RawContactEditorView.java
index ed9b0d4..1f2c28a 100644
--- a/src/com/android/contacts/views/editor/RawContactEditorView.java
+++ b/src/com/android/contacts/editor/RawContactEditorView.java
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
+import com.android.contacts.GroupMetaDataLoader;
import com.android.contacts.R;
import com.android.contacts.model.AccountType;
import com.android.contacts.model.AccountType.DataKind;
@@ -23,7 +24,6 @@
import com.android.contacts.model.EntityDelta;
import com.android.contacts.model.EntityDelta.ValuesDelta;
import com.android.contacts.model.EntityModifier;
-import com.android.contacts.views.GroupMetaDataLoader;
import android.content.Context;
import android.content.Entity;
diff --git a/src/com/android/contacts/views/editor/ReadOnlyRawContactEditorView.java b/src/com/android/contacts/editor/ReadOnlyRawContactEditorView.java
similarity index 99%
rename from src/com/android/contacts/views/editor/ReadOnlyRawContactEditorView.java
rename to src/com/android/contacts/editor/ReadOnlyRawContactEditorView.java
index 3b678ca..69fc39e 100644
--- a/src/com/android/contacts/views/editor/ReadOnlyRawContactEditorView.java
+++ b/src/com/android/contacts/editor/ReadOnlyRawContactEditorView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
import com.android.contacts.ContactsUtils;
import com.android.contacts.R;
diff --git a/src/com/android/contacts/views/editor/SelectAccountDialogFragment.java b/src/com/android/contacts/editor/SelectAccountDialogFragment.java
similarity index 98%
rename from src/com/android/contacts/views/editor/SelectAccountDialogFragment.java
rename to src/com/android/contacts/editor/SelectAccountDialogFragment.java
index 8130695..67c5f6e 100644
--- a/src/com/android/contacts/views/editor/SelectAccountDialogFragment.java
+++ b/src/com/android/contacts/editor/SelectAccountDialogFragment.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
import com.android.contacts.R;
import com.android.contacts.util.AccountsListAdapter;
diff --git a/src/com/android/contacts/views/editor/SplitContactConfirmationDialogFragment.java b/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java
similarity index 97%
rename from src/com/android/contacts/views/editor/SplitContactConfirmationDialogFragment.java
rename to src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java
index ee5dba3..8e86b95 100644
--- a/src/com/android/contacts/views/editor/SplitContactConfirmationDialogFragment.java
+++ b/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
import com.android.contacts.R;
diff --git a/src/com/android/contacts/views/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java
similarity index 99%
rename from src/com/android/contacts/views/editor/TextFieldsEditorView.java
rename to src/com/android/contacts/editor/TextFieldsEditorView.java
index 95d704f..30a3e88 100644
--- a/src/com/android/contacts/views/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/editor/TextFieldsEditorView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
import com.android.contacts.ContactsUtils;
import com.android.contacts.R;
diff --git a/src/com/android/contacts/views/editor/ViewIdGenerator.java b/src/com/android/contacts/editor/ViewIdGenerator.java
similarity index 98%
rename from src/com/android/contacts/views/editor/ViewIdGenerator.java
rename to src/com/android/contacts/editor/ViewIdGenerator.java
index cf21579..93bb002 100644
--- a/src/com/android/contacts/views/editor/ViewIdGenerator.java
+++ b/src/com/android/contacts/editor/ViewIdGenerator.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.views.editor;
+package com.android.contacts.editor;
import com.android.contacts.model.EntityDelta;
import com.android.contacts.model.AccountType.DataKind;
diff --git a/src/com/android/contacts/interactions/ContactDeletionInteraction.java b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
index 8d33670..78a98b8 100644
--- a/src/com/android/contacts/interactions/ContactDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
@@ -16,10 +16,10 @@
package com.android.contacts.interactions;
+import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
import com.android.contacts.model.AccountType;
import com.android.contacts.model.AccountTypes;
-import com.android.contacts.views.ContactSaveService;
import com.google.android.collect.Sets;
import android.app.Activity;
diff --git a/src/com/android/contacts/interactions/GroupCreationDialogFragment.java b/src/com/android/contacts/interactions/GroupCreationDialogFragment.java
index 70ba04f..8991928 100644
--- a/src/com/android/contacts/interactions/GroupCreationDialogFragment.java
+++ b/src/com/android/contacts/interactions/GroupCreationDialogFragment.java
@@ -15,8 +15,8 @@
*/
package com.android.contacts.interactions;
+import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
-import com.android.contacts.views.ContactSaveService;
import android.accounts.Account;
import android.app.Activity;
diff --git a/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java b/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java
index 2693dfa..fa60079 100644
--- a/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java
+++ b/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java
@@ -15,8 +15,8 @@
*/
package com.android.contacts.interactions;
+import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
-import com.android.contacts.views.ContactSaveService;
import android.app.AlertDialog;
import android.app.Dialog;
diff --git a/src/com/android/contacts/interactions/GroupRenamingDialogFragment.java b/src/com/android/contacts/interactions/GroupRenamingDialogFragment.java
index 223391e..0db435e 100644
--- a/src/com/android/contacts/interactions/GroupRenamingDialogFragment.java
+++ b/src/com/android/contacts/interactions/GroupRenamingDialogFragment.java
@@ -15,8 +15,8 @@
*/
package com.android.contacts.interactions;
+import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
-import com.android.contacts.views.ContactSaveService;
import android.app.FragmentManager;
import android.os.Bundle;
diff --git a/src/com/android/contacts/interactions/PhoneNumberInteraction.java b/src/com/android/contacts/interactions/PhoneNumberInteraction.java
index 6a340f3..c0b6eef 100644
--- a/src/com/android/contacts/interactions/PhoneNumberInteraction.java
+++ b/src/com/android/contacts/interactions/PhoneNumberInteraction.java
@@ -18,12 +18,12 @@
import com.android.contacts.Collapser;
import com.android.contacts.Collapser.Collapsible;
+import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
import com.android.contacts.model.AccountType;
import com.android.contacts.model.AccountType.DataKind;
import com.android.contacts.model.AccountType.StringInflater;
import com.android.contacts.model.AccountTypes;
-import com.android.contacts.views.ContactSaveService;
import android.app.Activity;
import android.app.AlertDialog;
diff --git a/src/com/android/contacts/model/ExchangeAccountType.java b/src/com/android/contacts/model/ExchangeAccountType.java
index cd4b1f9..2c03e40 100644
--- a/src/com/android/contacts/model/ExchangeAccountType.java
+++ b/src/com/android/contacts/model/ExchangeAccountType.java
@@ -17,8 +17,8 @@
package com.android.contacts.model;
import com.android.contacts.R;
+import com.android.contacts.editor.EventFieldEditorView;
import com.android.contacts.util.DateUtils;
-import com.android.contacts.views.editor.EventFieldEditorView;
import com.google.android.collect.Lists;
import android.content.ContentValues;
diff --git a/src/com/android/contacts/model/GoogleAccountType.java b/src/com/android/contacts/model/GoogleAccountType.java
index cd14696..c5a379a 100644
--- a/src/com/android/contacts/model/GoogleAccountType.java
+++ b/src/com/android/contacts/model/GoogleAccountType.java
@@ -17,8 +17,8 @@
package com.android.contacts.model;
import com.android.contacts.R;
+import com.android.contacts.editor.EventFieldEditorView;
import com.android.contacts.util.DateUtils;
-import com.android.contacts.views.editor.EventFieldEditorView;
import com.google.android.collect.Lists;
import android.content.ContentValues;
diff --git a/src/com/android/contacts/quickcontact/QuickContactWindow.java b/src/com/android/contacts/quickcontact/QuickContactWindow.java
index 03bbb9f..7265edd 100644
--- a/src/com/android/contacts/quickcontact/QuickContactWindow.java
+++ b/src/com/android/contacts/quickcontact/QuickContactWindow.java
@@ -18,6 +18,7 @@
import com.android.contacts.Collapser;
import com.android.contacts.ContactPresenceIconUtil;
+import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
import com.android.contacts.model.AccountType;
import com.android.contacts.model.AccountType.DataKind;
@@ -25,7 +26,6 @@
import com.android.contacts.util.Constants;
import com.android.contacts.util.DataStatus;
import com.android.contacts.util.NotifyingAsyncQueryHandler;
-import com.android.contacts.views.ContactSaveService;
import com.android.internal.policy.PolicyManager;
import com.google.android.collect.Lists;
diff --git a/src/com/android/contacts/socialwidget/SocialWidgetProvider.java b/src/com/android/contacts/socialwidget/SocialWidgetProvider.java
index 1695849..d5cf861 100644
--- a/src/com/android/contacts/socialwidget/SocialWidgetProvider.java
+++ b/src/com/android/contacts/socialwidget/SocialWidgetProvider.java
@@ -16,9 +16,9 @@
package com.android.contacts.socialwidget;
+import com.android.contacts.ContactLoader;
import com.android.contacts.R;
import com.android.contacts.util.ContactBadgeUtil;
-import com.android.contacts.views.ContactLoader;
import android.app.PendingIntent;
import android.appwidget.AppWidgetManager;
diff --git a/src/com/android/contacts/util/ContactBadgeUtil.java b/src/com/android/contacts/util/ContactBadgeUtil.java
index e5712d4..65025f8 100644
--- a/src/com/android/contacts/util/ContactBadgeUtil.java
+++ b/src/com/android/contacts/util/ContactBadgeUtil.java
@@ -16,8 +16,8 @@
package com.android.contacts.util;
+import com.android.contacts.ContactLoader;
import com.android.contacts.R;
-import com.android.contacts.views.ContactLoader;
import android.content.Context;
import android.content.pm.PackageManager;
diff --git a/tests/src/com/android/contacts/ContactLoaderTest.java b/tests/src/com/android/contacts/ContactLoaderTest.java
index 3ef109d..3a4f0da 100644
--- a/tests/src/com/android/contacts/ContactLoaderTest.java
+++ b/tests/src/com/android/contacts/ContactLoaderTest.java
@@ -18,7 +18,6 @@
import com.android.contacts.tests.mocks.ContactsMockContext;
import com.android.contacts.tests.mocks.MockContentProvider;
-import com.android.contacts.views.ContactLoader;
import android.content.ContentUris;
import android.net.Uri;