summaryrefslogtreecommitdiff
path: root/java/com/android/contacts
diff options
context:
space:
mode:
Diffstat (limited to 'java/com/android/contacts')
-rw-r--r--java/com/android/contacts/common/ContactTileLoaderFactory.java2
-rw-r--r--java/com/android/contacts/common/dialog/ClearFrequentsDialog.java4
-rw-r--r--java/com/android/contacts/common/list/ContactEntryListAdapter.java2
-rw-r--r--java/com/android/contacts/common/list/ContactEntryListFragment.java10
-rw-r--r--java/com/android/contacts/common/list/DefaultContactListAdapter.java2
-rw-r--r--java/com/android/contacts/common/list/DirectoryListLoader.java2
-rw-r--r--java/com/android/contacts/common/list/PhoneNumberListAdapter.java2
-rw-r--r--java/com/android/contacts/common/list/PhoneNumberPickerFragment.java2
-rw-r--r--java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java2
9 files changed, 14 insertions, 14 deletions
diff --git a/java/com/android/contacts/common/ContactTileLoaderFactory.java b/java/com/android/contacts/common/ContactTileLoaderFactory.java
index 0791517ca..d71472ef8 100644
--- a/java/com/android/contacts/common/ContactTileLoaderFactory.java
+++ b/java/com/android/contacts/common/ContactTileLoaderFactory.java
@@ -16,12 +16,12 @@
package com.android.contacts.common;
import android.content.Context;
+import android.content.CursorLoader;
import android.net.Uri;
import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.Contacts;
import android.support.annotation.VisibleForTesting;
-import android.support.v4.content.CursorLoader;
/**
* Used to create {@link CursorLoader} which finds contacts information from the strequents table.
diff --git a/java/com/android/contacts/common/dialog/ClearFrequentsDialog.java b/java/com/android/contacts/common/dialog/ClearFrequentsDialog.java
index 60c7fc0ac..751490a22 100644
--- a/java/com/android/contacts/common/dialog/ClearFrequentsDialog.java
+++ b/java/com/android/contacts/common/dialog/ClearFrequentsDialog.java
@@ -18,6 +18,8 @@ package com.android.contacts.common.dialog;
import android.app.AlertDialog;
import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.FragmentManager;
import android.app.ProgressDialog;
import android.content.ContentResolver;
import android.content.Context;
@@ -26,8 +28,6 @@ import android.content.DialogInterface.OnClickListener;
import android.os.AsyncTask;
import android.os.Bundle;
import android.provider.ContactsContract;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentManager;
import com.android.contacts.common.R;
import com.android.dialer.util.PermissionsUtil;
diff --git a/java/com/android/contacts/common/list/ContactEntryListAdapter.java b/java/com/android/contacts/common/list/ContactEntryListAdapter.java
index 19e43d81e..7335297e0 100644
--- a/java/com/android/contacts/common/list/ContactEntryListAdapter.java
+++ b/java/com/android/contacts/common/list/ContactEntryListAdapter.java
@@ -16,6 +16,7 @@
package com.android.contacts.common.list;
import android.content.Context;
+import android.content.CursorLoader;
import android.content.res.Resources;
import android.database.Cursor;
import android.net.Uri;
@@ -24,7 +25,6 @@ import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Directory;
-import android.support.v4.content.CursorLoader;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/java/com/android/contacts/common/list/ContactEntryListFragment.java b/java/com/android/contacts/common/list/ContactEntryListFragment.java
index d39c5af5c..04658be89 100644
--- a/java/com/android/contacts/common/list/ContactEntryListFragment.java
+++ b/java/com/android/contacts/common/list/ContactEntryListFragment.java
@@ -16,7 +16,12 @@
package com.android.contacts.common.list;
+import android.app.Fragment;
+import android.app.LoaderManager;
+import android.app.LoaderManager.LoaderCallbacks;
import android.content.Context;
+import android.content.CursorLoader;
+import android.content.Loader;
import android.database.Cursor;
import android.os.Bundle;
import android.os.Handler;
@@ -24,11 +29,6 @@ import android.os.Message;
import android.os.Parcelable;
import android.provider.ContactsContract.Directory;
import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.MotionEvent;
diff --git a/java/com/android/contacts/common/list/DefaultContactListAdapter.java b/java/com/android/contacts/common/list/DefaultContactListAdapter.java
index 115434e18..7bcae0e0e 100644
--- a/java/com/android/contacts/common/list/DefaultContactListAdapter.java
+++ b/java/com/android/contacts/common/list/DefaultContactListAdapter.java
@@ -16,6 +16,7 @@
package com.android.contacts.common.list;
import android.content.Context;
+import android.content.CursorLoader;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.net.Uri;
@@ -25,7 +26,6 @@ import android.provider.ContactsContract;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Directory;
import android.provider.ContactsContract.SearchSnippets;
-import android.support.v4.content.CursorLoader;
import android.text.TextUtils;
import android.view.View;
import com.android.contacts.common.compat.ContactsCompat;
diff --git a/java/com/android/contacts/common/list/DirectoryListLoader.java b/java/com/android/contacts/common/list/DirectoryListLoader.java
index 89c6b2f4c..be62cc7a8 100644
--- a/java/com/android/contacts/common/list/DirectoryListLoader.java
+++ b/java/com/android/contacts/common/list/DirectoryListLoader.java
@@ -15,6 +15,7 @@
*/
package com.android.contacts.common.list;
+import android.content.AsyncTaskLoader;
import android.content.Context;
import android.content.pm.PackageManager;
import android.database.ContentObserver;
@@ -23,7 +24,6 @@ import android.database.MatrixCursor;
import android.net.Uri;
import android.os.Handler;
import android.provider.ContactsContract.Directory;
-import android.support.v4.content.AsyncTaskLoader;
import android.text.TextUtils;
import com.android.contacts.common.R;
import com.android.contacts.common.compat.DirectoryCompat;
diff --git a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
index 395024708..d1118c3c7 100644
--- a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
+++ b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
@@ -17,6 +17,7 @@
package com.android.contacts.common.list;
import android.content.Context;
+import android.content.CursorLoader;
import android.database.Cursor;
import android.net.Uri;
import android.net.Uri.Builder;
@@ -26,7 +27,6 @@ import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.CommonDataKinds.SipAddress;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Directory;
-import android.support.v4.content.CursorLoader;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
diff --git a/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java b/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java
index e9083ae78..558f3b209 100644
--- a/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java
+++ b/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java
@@ -17,11 +17,11 @@ package com.android.contacts.common.list;
import android.content.ComponentName;
import android.content.Intent;
+import android.content.Loader;
import android.database.Cursor;
import android.os.Bundle;
import android.support.annotation.MainThread;
import android.support.annotation.Nullable;
-import android.support.v4.content.Loader;
import android.text.TextUtils;
import android.util.ArraySet;
import android.view.LayoutInflater;
diff --git a/java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java b/java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
index 99c18468b..8156d97cf 100644
--- a/java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
+++ b/java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
@@ -19,13 +19,13 @@ package com.android.contacts.common.widget;
import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.app.Dialog;
+import android.app.DialogFragment;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.os.Handler;
import android.os.ResultReceiver;
import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;