Move Editor-related files into views.editor
Change-Id: I61d68295c6af2a5ccf018dab4b9d50c0aa601fcd
diff --git a/res/layout-xlarge/item_contact_editor.xml b/res/layout-xlarge/item_contact_editor.xml
index 39248d6..a8386f3 100644
--- a/res/layout-xlarge/item_contact_editor.xml
+++ b/res/layout-xlarge/item_contact_editor.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.contacts.ui.widget.ContactEditorView
+<com.android.contacts.views.editor.ContactEditorView
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"
@@ -122,7 +122,7 @@
ex:layout_narrowRightMargin="50dip"
>
- <com.android.contacts.ui.widget.GenericEditorView
+ <com.android.contacts.views.editor.GenericEditorView
android:id="@+id/edit_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -163,4 +163,4 @@
android:layout_marginTop="10dip"
/>
</LinearLayout>
-</com.android.contacts.ui.widget.ContactEditorView>
+</com.android.contacts.views.editor.ContactEditorView>
diff --git a/res/layout-xlarge/item_group_membership.xml b/res/layout-xlarge/item_group_membership.xml
index 2c773ce..4ce0eb4 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.ui.widget.GroupMembershipView
+<com.android.contacts.views.editor.GroupMembershipView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -41,4 +41,4 @@
android:gravity="left"
android:ellipsize="end"
/>
-</com.android.contacts.ui.widget.GroupMembershipView>
+</com.android.contacts.views.editor.GroupMembershipView>
diff --git a/res/layout-xlarge/item_kind_section.xml b/res/layout-xlarge/item_kind_section.xml
index 4641cb0..9ab5d97 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.ui.widget.KindSectionView
+<com.android.contacts.views.editor.KindSectionView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -50,4 +50,4 @@
android:src="@drawable/btn_plus"
android:background="@null"
android:contentDescription="@string/description_plus_button" />
-</com.android.contacts.ui.widget.KindSectionView>
+</com.android.contacts.views.editor.KindSectionView>
diff --git a/res/layout-xlarge/item_photo_editor.xml b/res/layout-xlarge/item_photo_editor.xml
index b981131..35ade24 100644
--- a/res/layout-xlarge/item_photo_editor.xml
+++ b/res/layout-xlarge/item_photo_editor.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.contacts.ui.widget.PhotoEditorView
+<com.android.contacts.views.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/item_contact_editor.xml b/res/layout/item_contact_editor.xml
index 6886503..51a38a0 100644
--- a/res/layout/item_contact_editor.xml
+++ b/res/layout/item_contact_editor.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.contacts.ui.widget.ContactEditorView
+<com.android.contacts.views.editor.ContactEditorView
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.ui.widget.GenericEditorView
+ <com.android.contacts.views.editor.GenericEditorView
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.ui.widget.ContactEditorView>
+</com.android.contacts.views.editor.ContactEditorView>
diff --git a/res/layout/item_group_membership.xml b/res/layout/item_group_membership.xml
index f9afdf9..b349390 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.ui.widget.GroupMembershipView
+<com.android.contacts.views.editor.GroupMembershipView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -62,4 +62,4 @@
android:gravity="left"
/>
-</com.android.contacts.ui.widget.GroupMembershipView>
+</com.android.contacts.views.editor.GroupMembershipView>
diff --git a/res/layout/item_kind_section.xml b/res/layout/item_kind_section.xml
index 61e6f6f..0b0656d 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.ui.widget.KindSectionView
+<com.android.contacts.views.editor.KindSectionView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -74,4 +74,4 @@
android:paddingBottom="6dip"
android:orientation="vertical" />
-</com.android.contacts.ui.widget.KindSectionView>
+</com.android.contacts.views.editor.KindSectionView>
diff --git a/res/layout/item_photo_editor.xml b/res/layout/item_photo_editor.xml
index b981131..35ade24 100644
--- a/res/layout/item_photo_editor.xml
+++ b/res/layout/item_photo_editor.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.contacts.ui.widget.PhotoEditorView
+<com.android.contacts.views.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/item_read_only_contact_editor.xml b/res/layout/item_read_only_contact_editor.xml
index df442c8..b7895a5 100644
--- a/res/layout/item_read_only_contact_editor.xml
+++ b/res/layout/item_read_only_contact_editor.xml
@@ -15,7 +15,7 @@
-->
<!-- placed inside act_edit as tabcontent -->
-<com.android.contacts.ui.widget.ReadOnlyContactEditorView
+<com.android.contacts.views.editor.ReadOnlyContactEditorView
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.ui.widget.ReadOnlyContactEditorView>
+</com.android.contacts.views.editor.ReadOnlyContactEditorView>
diff --git a/res/layout/quickcontact_item.xml b/res/layout/quickcontact_item.xml
index 8580ac5..f9e4736 100644
--- a/res/layout/quickcontact_item.xml
+++ b/res/layout/quickcontact_item.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.contacts.ui.widget.CheckableImageView
+<com.android.contacts.ui.CheckableImageView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="59dip"
android:layout_height="51dip"
diff --git a/src/com/android/contacts/ui/widget/CheckableImageView.java b/src/com/android/contacts/ui/CheckableImageView.java
similarity index 97%
rename from src/com/android/contacts/ui/widget/CheckableImageView.java
rename to src/com/android/contacts/ui/CheckableImageView.java
index ff5abc0..1f94e20 100644
--- a/src/com/android/contacts/ui/widget/CheckableImageView.java
+++ b/src/com/android/contacts/ui/CheckableImageView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.ui.widget;
+package com.android.contacts.ui;
import android.content.Context;
import android.util.AttributeSet;
diff --git a/src/com/android/contacts/ui/QuickContactWindow.java b/src/com/android/contacts/ui/QuickContactWindow.java
index ca40066..7bd3c39 100644
--- a/src/com/android/contacts/ui/QuickContactWindow.java
+++ b/src/com/android/contacts/ui/QuickContactWindow.java
@@ -23,7 +23,6 @@
import com.android.contacts.model.ContactsSource;
import com.android.contacts.model.ContactsSource.DataKind;
import com.android.contacts.model.Sources;
-import com.android.contacts.ui.widget.CheckableImageView;
import com.android.contacts.util.Constants;
import com.android.contacts.util.DataStatus;
import com.android.contacts.util.NotifyingAsyncQueryHandler;
diff --git a/src/com/android/contacts/ui/ShowOrCreateActivity.java b/src/com/android/contacts/ui/ShowOrCreateActivity.java
index 2d8217f..23919f0 100755
--- a/src/com/android/contacts/ui/ShowOrCreateActivity.java
+++ b/src/com/android/contacts/ui/ShowOrCreateActivity.java
@@ -28,16 +28,15 @@
import android.content.ComponentName;
import android.content.ContentUris;
import android.content.DialogInterface;
-import android.content.EntityIterator;
import android.content.Intent;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
+import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Intents;
import android.provider.ContactsContract.PhoneLookup;
import android.provider.ContactsContract.RawContacts;
-import android.provider.ContactsContract.CommonDataKinds.Email;
import android.util.Log;
/**
diff --git a/src/com/android/contacts/ui/widget/AggregationSuggestionView.java b/src/com/android/contacts/views/editor/AggregationSuggestionView.java
similarity index 98%
rename from src/com/android/contacts/ui/widget/AggregationSuggestionView.java
rename to src/com/android/contacts/views/editor/AggregationSuggestionView.java
index 04e5827..8880e67 100644
--- a/src/com/android/contacts/ui/widget/AggregationSuggestionView.java
+++ b/src/com/android/contacts/views/editor/AggregationSuggestionView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.ui.widget;
+package com.android.contacts.views.editor;
import com.android.contacts.R;
import com.android.contacts.views.editor.AggregationSuggestionEngine.Suggestion;
diff --git a/src/com/android/contacts/ui/widget/BaseContactEditorView.java b/src/com/android/contacts/views/editor/BaseContactEditorView.java
similarity index 97%
rename from src/com/android/contacts/ui/widget/BaseContactEditorView.java
rename to src/com/android/contacts/views/editor/BaseContactEditorView.java
index 806584e..f459708 100644
--- a/src/com/android/contacts/ui/widget/BaseContactEditorView.java
+++ b/src/com/android/contacts/views/editor/BaseContactEditorView.java
@@ -14,14 +14,13 @@
* limitations under the License.
*/
-package com.android.contacts.ui.widget;
+package com.android.contacts.views.editor;
import com.android.contacts.model.ContactsSource;
import com.android.contacts.model.ContactsSource.EditType;
import com.android.contacts.model.EntityDelta;
import com.android.contacts.model.EntityDelta.ValuesDelta;
import com.android.contacts.model.EntityModifier;
-import com.android.contacts.ui.ViewIdGenerator;
import android.content.Context;
import android.content.Entity;
diff --git a/src/com/android/contacts/views/editor/ContactEditorFragment.java b/src/com/android/contacts/views/editor/ContactEditorFragment.java
index 9979042..6674f64 100644
--- a/src/com/android/contacts/views/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/views/editor/ContactEditorFragment.java
@@ -19,25 +19,18 @@
import com.android.contacts.JoinContactActivity;
import com.android.contacts.R;
import com.android.contacts.model.ContactsSource;
-import com.android.contacts.model.Editor;
-import com.android.contacts.model.Editor.EditorListener;
import com.android.contacts.model.EntityDelta;
import com.android.contacts.model.EntityDelta.ValuesDelta;
import com.android.contacts.model.EntityDeltaList;
import com.android.contacts.model.EntityModifier;
import com.android.contacts.model.GoogleSource;
import com.android.contacts.model.Sources;
-import com.android.contacts.ui.ViewIdGenerator;
-import com.android.contacts.ui.widget.AggregationSuggestionView;
-import com.android.contacts.ui.widget.BaseContactEditorView;
-import com.android.contacts.ui.widget.ContactEditorView;
-import com.android.contacts.ui.widget.GenericEditorView;
-import com.android.contacts.ui.widget.PhotoEditorView;
import com.android.contacts.util.EmptyService;
import com.android.contacts.util.WeakAsyncTask;
import com.android.contacts.views.ContactLoader;
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/ui/widget/ContactEditorView.java b/src/com/android/contacts/views/editor/ContactEditorView.java
similarity index 98%
rename from src/com/android/contacts/ui/widget/ContactEditorView.java
rename to src/com/android/contacts/views/editor/ContactEditorView.java
index 46e071a..4eec842 100644
--- a/src/com/android/contacts/ui/widget/ContactEditorView.java
+++ b/src/com/android/contacts/views/editor/ContactEditorView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.ui.widget;
+package com.android.contacts.views.editor;
import com.android.contacts.R;
import com.android.contacts.model.ContactsSource;
@@ -23,7 +23,6 @@
import com.android.contacts.model.ContactsSource.DataKind;
import com.android.contacts.model.ContactsSource.EditType;
import com.android.contacts.model.EntityDelta.ValuesDelta;
-import com.android.contacts.ui.ViewIdGenerator;
import android.content.Context;
import android.content.Entity;
diff --git a/src/com/android/contacts/model/Editor.java b/src/com/android/contacts/views/editor/Editor.java
similarity index 96%
rename from src/com/android/contacts/model/Editor.java
rename to src/com/android/contacts/views/editor/Editor.java
index c73839d..cb1be64 100644
--- a/src/com/android/contacts/model/Editor.java
+++ b/src/com/android/contacts/views/editor/Editor.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.android.contacts.model;
+package com.android.contacts.views.editor;
+import com.android.contacts.model.EntityDelta;
import com.android.contacts.model.ContactsSource.DataKind;
import com.android.contacts.model.EntityDelta.ValuesDelta;
-import com.android.contacts.ui.ViewIdGenerator;
import android.provider.ContactsContract.Data;
diff --git a/src/com/android/contacts/ui/widget/GenericEditorView.java b/src/com/android/contacts/views/editor/GenericEditorView.java
similarity index 99%
rename from src/com/android/contacts/ui/widget/GenericEditorView.java
rename to src/com/android/contacts/views/editor/GenericEditorView.java
index 80eed28..94868cb 100644
--- a/src/com/android/contacts/ui/widget/GenericEditorView.java
+++ b/src/com/android/contacts/views/editor/GenericEditorView.java
@@ -14,18 +14,16 @@
* limitations under the License.
*/
-package com.android.contacts.ui.widget;
+package com.android.contacts.views.editor;
import com.android.contacts.ContactsUtils;
import com.android.contacts.R;
import com.android.contacts.model.ContactsSource.DataKind;
import com.android.contacts.model.ContactsSource.EditField;
import com.android.contacts.model.ContactsSource.EditType;
-import com.android.contacts.model.Editor;
import com.android.contacts.model.EntityDelta;
import com.android.contacts.model.EntityDelta.ValuesDelta;
import com.android.contacts.model.EntityModifier;
-import com.android.contacts.ui.ViewIdGenerator;
import com.android.contacts.util.DialogManager;
import com.android.contacts.util.DialogManager.DialogShowingView;
diff --git a/src/com/android/contacts/ui/widget/GroupMembershipView.java b/src/com/android/contacts/views/editor/GroupMembershipView.java
similarity index 99%
rename from src/com/android/contacts/ui/widget/GroupMembershipView.java
rename to src/com/android/contacts/views/editor/GroupMembershipView.java
index f141046..81fcc25 100644
--- a/src/com/android/contacts/ui/widget/GroupMembershipView.java
+++ b/src/com/android/contacts/views/editor/GroupMembershipView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.ui.widget;
+package com.android.contacts.views.editor;
import com.android.contacts.R;
import com.android.contacts.model.ContactsSource.DataKind;
diff --git a/src/com/android/contacts/ui/widget/KindSectionView.java b/src/com/android/contacts/views/editor/KindSectionView.java
similarity index 97%
rename from src/com/android/contacts/ui/widget/KindSectionView.java
rename to src/com/android/contacts/views/editor/KindSectionView.java
index f9d0ceb..044e6b2 100644
--- a/src/com/android/contacts/ui/widget/KindSectionView.java
+++ b/src/com/android/contacts/views/editor/KindSectionView.java
@@ -14,16 +14,14 @@
* limitations under the License.
*/
-package com.android.contacts.ui.widget;
+package com.android.contacts.views.editor;
import com.android.contacts.R;
import com.android.contacts.model.ContactsSource.DataKind;
-import com.android.contacts.model.Editor;
-import com.android.contacts.model.Editor.EditorListener;
import com.android.contacts.model.EntityDelta;
import com.android.contacts.model.EntityDelta.ValuesDelta;
import com.android.contacts.model.EntityModifier;
-import com.android.contacts.ui.ViewIdGenerator;
+import com.android.contacts.views.editor.Editor.EditorListener;
import android.content.Context;
import android.provider.ContactsContract.Data;
diff --git a/src/com/android/contacts/ui/widget/PhotoEditorView.java b/src/com/android/contacts/views/editor/PhotoEditorView.java
similarity index 97%
rename from src/com/android/contacts/ui/widget/PhotoEditorView.java
rename to src/com/android/contacts/views/editor/PhotoEditorView.java
index da1be85..15186a5 100644
--- a/src/com/android/contacts/ui/widget/PhotoEditorView.java
+++ b/src/com/android/contacts/views/editor/PhotoEditorView.java
@@ -14,14 +14,12 @@
* limitations under the License.
*/
-package com.android.contacts.ui.widget;
+package com.android.contacts.views.editor;
import com.android.contacts.R;
import com.android.contacts.model.EntityDelta;
import com.android.contacts.model.ContactsSource.DataKind;
import com.android.contacts.model.EntityDelta.ValuesDelta;
-import com.android.contacts.model.Editor;
-import com.android.contacts.ui.ViewIdGenerator;
import android.content.Context;
import android.graphics.Bitmap;
diff --git a/src/com/android/contacts/ui/widget/ReadOnlyContactEditorView.java b/src/com/android/contacts/views/editor/ReadOnlyContactEditorView.java
similarity index 97%
rename from src/com/android/contacts/ui/widget/ReadOnlyContactEditorView.java
rename to src/com/android/contacts/views/editor/ReadOnlyContactEditorView.java
index 5c114d1..5a0e896 100644
--- a/src/com/android/contacts/ui/widget/ReadOnlyContactEditorView.java
+++ b/src/com/android/contacts/views/editor/ReadOnlyContactEditorView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.ui.widget;
+package com.android.contacts.views.editor;
import com.android.contacts.ContactsUtils;
import com.android.contacts.R;
@@ -23,9 +23,8 @@
import com.android.contacts.model.EntityModifier;
import com.android.contacts.model.ContactsSource.DataKind;
import com.android.contacts.model.ContactsSource.EditType;
-import com.android.contacts.model.Editor.EditorListener;
import com.android.contacts.model.EntityDelta.ValuesDelta;
-import com.android.contacts.ui.ViewIdGenerator;
+import com.android.contacts.views.editor.Editor.EditorListener;
import android.content.Context;
import android.content.Entity;
diff --git a/src/com/android/contacts/ui/ViewIdGenerator.java b/src/com/android/contacts/views/editor/ViewIdGenerator.java
similarity index 96%
rename from src/com/android/contacts/ui/ViewIdGenerator.java
rename to src/com/android/contacts/views/editor/ViewIdGenerator.java
index f7281d4..ded46fc 100644
--- a/src/com/android/contacts/ui/ViewIdGenerator.java
+++ b/src/com/android/contacts/views/editor/ViewIdGenerator.java
@@ -14,13 +14,11 @@
* limitations under the License.
*/
-package com.android.contacts.ui;
+package com.android.contacts.views.editor;
import com.android.contacts.model.EntityDelta;
import com.android.contacts.model.ContactsSource.DataKind;
import com.android.contacts.model.EntityDelta.ValuesDelta;
-import com.android.contacts.ui.widget.GenericEditorView;
-import com.android.contacts.ui.widget.KindSectionView;
import android.os.Bundle;
import android.os.Parcel;