Renaming a couple of packages

Change-Id: I2c0f86b51baa622df629206f8b79ef1d0df09119
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>