diff options
Diffstat (limited to 'java/com/android/contacts')
5 files changed, 4 insertions, 59 deletions
diff --git a/java/com/android/contacts/common/ContactsUtils.java b/java/com/android/contacts/common/ContactsUtils.java index bc0e42300..bca8b62e0 100644 --- a/java/com/android/contacts/common/ContactsUtils.java +++ b/java/com/android/contacts/common/ContactsUtils.java @@ -18,7 +18,7 @@ package com.android.contacts.common; import android.provider.ContactsContract.Contacts; import android.support.annotation.IntDef; -import com.android.contacts.common.compat.DirectoryCompat; +import com.android.dialer.common.cp2.DirectoryCompat; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/java/com/android/contacts/common/compat/DirectoryCompat.java b/java/com/android/contacts/common/compat/DirectoryCompat.java deleted file mode 100644 index e67087659..000000000 --- a/java/com/android/contacts/common/compat/DirectoryCompat.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.contacts.common.compat; - -import android.net.Uri; -import android.os.Build.VERSION; -import android.os.Build.VERSION_CODES; -import android.provider.ContactsContract.Directory; - -public class DirectoryCompat { - - public static Uri getContentUri() { - if (VERSION.SDK_INT >= VERSION_CODES.N) { - return Directory.ENTERPRISE_CONTENT_URI; - } - return Directory.CONTENT_URI; - } - - public static boolean isInvisibleDirectory(long directoryId) { - if (VERSION.SDK_INT >= VERSION_CODES.N) { - return (directoryId == Directory.LOCAL_INVISIBLE - || directoryId == Directory.ENTERPRISE_LOCAL_INVISIBLE); - } - return directoryId == Directory.LOCAL_INVISIBLE; - } - - public static boolean isRemoteDirectoryId(long directoryId) { - if (VERSION.SDK_INT >= VERSION_CODES.N) { - return Directory.isRemoteDirectoryId(directoryId); - } - return !(directoryId == Directory.DEFAULT || directoryId == Directory.LOCAL_INVISIBLE); - } - - public static boolean isEnterpriseDirectoryId(long directoryId) { - return VERSION.SDK_INT >= VERSION_CODES.N && Directory.isEnterpriseDirectoryId(directoryId); - } - - public static boolean isOnlyEnterpriseDirectoryId(long directoryId) { - return isEnterpriseDirectoryId(directoryId) && !isRemoteDirectoryId(directoryId); - } -} diff --git a/java/com/android/contacts/common/list/ContactEntryListAdapter.java b/java/com/android/contacts/common/list/ContactEntryListAdapter.java index 117825dce..413a1deff 100644 --- a/java/com/android/contacts/common/list/ContactEntryListAdapter.java +++ b/java/com/android/contacts/common/list/ContactEntryListAdapter.java @@ -34,9 +34,9 @@ import android.widget.SectionIndexer; import android.widget.TextView; import com.android.contacts.common.ContactsUtils; import com.android.contacts.common.R; -import com.android.contacts.common.compat.DirectoryCompat; import com.android.contacts.common.util.SearchUtil; import com.android.dialer.common.LogUtil; +import com.android.dialer.common.cp2.DirectoryCompat; import com.android.dialer.compat.CompatUtils; import com.android.dialer.configprovider.ConfigProviderBindings; import com.android.dialer.contactphoto.ContactPhotoManager; diff --git a/java/com/android/contacts/common/list/DirectoryListLoader.java b/java/com/android/contacts/common/list/DirectoryListLoader.java index be62cc7a8..ce78d2cff 100644 --- a/java/com/android/contacts/common/list/DirectoryListLoader.java +++ b/java/com/android/contacts/common/list/DirectoryListLoader.java @@ -26,8 +26,8 @@ import android.os.Handler; import android.provider.ContactsContract.Directory; import android.text.TextUtils; import com.android.contacts.common.R; -import com.android.contacts.common.compat.DirectoryCompat; import com.android.dialer.common.LogUtil; +import com.android.dialer.common.cp2.DirectoryCompat; import com.android.dialer.util.PermissionsUtil; /** A specialized loader for the list of directories, see {@link Directory}. */ diff --git a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java index 58628d2a3..3c45abf37 100644 --- a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java +++ b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java @@ -34,13 +34,13 @@ import android.view.ViewGroup; import com.android.contacts.common.ContactsUtils; import com.android.contacts.common.R; import com.android.contacts.common.compat.CallableCompat; -import com.android.contacts.common.compat.DirectoryCompat; import com.android.contacts.common.compat.PhoneCompat; import com.android.contacts.common.extensions.PhoneDirectoryExtenderAccessor; import com.android.contacts.common.list.ContactListItemView.CallToAction; import com.android.contacts.common.preference.ContactsPreferences; import com.android.contacts.common.util.Constants; import com.android.dialer.common.LogUtil; +import com.android.dialer.common.cp2.DirectoryCompat; import com.android.dialer.compat.CompatUtils; import com.android.dialer.configprovider.ConfigProviderBindings; import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest; |