From 437ae9552cce7768068fa92663740711ee541417 Mon Sep 17 00:00:00 2001 From: linyuh Date: Mon, 26 Mar 2018 12:46:18 -0700 Subject: Remove obsolete version checks and compat utilities after min SDK was bumped up to N. Test: Existing tests PiperOrigin-RevId: 190508397 Change-Id: Ia5f33e45af1d1cc666fec5f43efa564b2b68c193 --- .../directories/DirectoriesCursorLoader.java | 17 +++++++---------- .../directories/DirectoryContactViewHolder.java | 4 ++-- .../directories/DirectoryContactsCursor.java | 4 ++-- .../directories/DirectoryContactsCursorLoader.java | 17 +++++------------ 4 files changed, 16 insertions(+), 26 deletions(-) (limited to 'java/com/android/dialer/searchfragment') diff --git a/java/com/android/dialer/searchfragment/directories/DirectoriesCursorLoader.java b/java/com/android/dialer/searchfragment/directories/DirectoriesCursorLoader.java index 4d7ea3f3d..754e055f0 100644 --- a/java/com/android/dialer/searchfragment/directories/DirectoriesCursorLoader.java +++ b/java/com/android/dialer/searchfragment/directories/DirectoriesCursorLoader.java @@ -20,9 +20,6 @@ package com.android.dialer.searchfragment.directories; import android.content.Context; import android.content.CursorLoader; import android.database.Cursor; -import android.net.Uri; -import android.os.Build.VERSION; -import android.os.Build.VERSION_CODES; import android.provider.ContactsContract; import android.support.annotation.Nullable; import com.android.dialer.common.LogUtil; @@ -51,7 +48,13 @@ public final class DirectoriesCursorLoader extends CursorLoader { private static final int PHOTO_SUPPORT = 2; public DirectoriesCursorLoader(Context context) { - super(context, getContentUri(), PROJECTION, null, null, ContactsContract.Directory._ID); + super( + context, + ContactsContract.Directory.ENTERPRISE_CONTENT_URI, + PROJECTION, + null, + null, + ContactsContract.Directory._ID); } @Override @@ -88,12 +91,6 @@ public final class DirectoriesCursorLoader extends CursorLoader { return directories; } - private static Uri getContentUri() { - return VERSION.SDK_INT >= VERSION_CODES.N - ? ContactsContract.Directory.ENTERPRISE_CONTENT_URI - : ContactsContract.Directory.CONTENT_URI; - } - /** POJO representing the results returned from {@link DirectoriesCursorLoader}. */ @AutoValue public abstract static class Directory { diff --git a/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java b/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java index fbb662ce9..29127ffce 100644 --- a/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java +++ b/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java @@ -29,7 +29,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.QuickContactBadge; import android.widget.TextView; -import com.android.dialer.common.cp2.DirectoryCompat; +import com.android.dialer.common.cp2.DirectoryUtils; import com.android.dialer.contactphoto.ContactPhotoManager; import com.android.dialer.lettertile.LetterTileDrawable; import com.android.dialer.searchfragment.common.Projections; @@ -80,7 +80,7 @@ public final class DirectoryContactViewHolder extends RecyclerView.ViewHolder nameView.setText(QueryBoldingUtil.getNameWithQueryBolded(query, name, context)); numberView.setText(QueryBoldingUtil.getNameWithQueryBolded(query, secondaryInfo, context)); workBadge.setVisibility( - DirectoryCompat.isOnlyEnterpriseDirectoryId(cursor.getDirectoryId()) + DirectoryUtils.isLocalEnterpriseDirectoryId(cursor.getDirectoryId()) ? View.VISIBLE : View.GONE); diff --git a/java/com/android/dialer/searchfragment/directories/DirectoryContactsCursor.java b/java/com/android/dialer/searchfragment/directories/DirectoryContactsCursor.java index 0c1ad8318..b081de09c 100644 --- a/java/com/android/dialer/searchfragment/directories/DirectoryContactsCursor.java +++ b/java/com/android/dialer/searchfragment/directories/DirectoryContactsCursor.java @@ -23,7 +23,7 @@ import android.database.MergeCursor; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import com.android.dialer.common.Assert; -import com.android.dialer.common.cp2.DirectoryCompat; +import com.android.dialer.common.cp2.DirectoryUtils; import com.android.dialer.searchfragment.common.SearchCursor; import com.android.dialer.searchfragment.directories.DirectoriesCursorLoader.Directory; import java.util.ArrayList; @@ -101,7 +101,7 @@ public final class DirectoryContactsCursor extends MergeCursor implements Search private static MatrixCursor createHeaderCursor(Context context, String name, long id) { MatrixCursor headerCursor = new MatrixCursor(PROJECTION, 1); - if (DirectoryCompat.isOnlyEnterpriseDirectoryId(id)) { + if (DirectoryUtils.isLocalEnterpriseDirectoryId(id)) { headerCursor.addRow( new Object[] {context.getString(R.string.directory_search_label_work), id}); } else { diff --git a/java/com/android/dialer/searchfragment/directories/DirectoryContactsCursorLoader.java b/java/com/android/dialer/searchfragment/directories/DirectoryContactsCursorLoader.java index d719cb9d9..bf56a1c18 100644 --- a/java/com/android/dialer/searchfragment/directories/DirectoryContactsCursorLoader.java +++ b/java/com/android/dialer/searchfragment/directories/DirectoryContactsCursorLoader.java @@ -21,13 +21,11 @@ import android.content.CursorLoader; import android.database.Cursor; import android.database.MatrixCursor; import android.net.Uri; -import android.os.Build.VERSION; -import android.os.Build.VERSION_CODES; import android.provider.ContactsContract; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.support.annotation.NonNull; import android.support.annotation.VisibleForTesting; -import com.android.dialer.common.cp2.DirectoryCompat; +import com.android.dialer.common.cp2.DirectoryUtils; import com.android.dialer.searchfragment.common.Projections; import com.android.dialer.searchfragment.directories.DirectoriesCursorLoader.Directory; import java.util.ArrayList; @@ -71,14 +69,14 @@ public final class DirectoryContactsCursorLoader extends CursorLoader { for (int i = 0; i < directories.size(); i++) { Directory directory = directories.get(i); - if (!DirectoryCompat.isRemoteDirectoryId(directory.getId()) - && !DirectoryCompat.isEnterpriseDirectoryId(directory.getId())) { + if (!ContactsContract.Directory.isRemoteDirectoryId(directory.getId()) + && !ContactsContract.Directory.isEnterpriseDirectoryId(directory.getId())) { cursors[i] = null; continue; } // Filter out invisible directories. - if (DirectoryCompat.isInvisibleDirectory(directory.getId())) { + if (DirectoryUtils.isInvisibleDirectoryId(directory.getId())) { cursors[i] = null; continue; } @@ -145,12 +143,7 @@ public final class DirectoryContactsCursorLoader extends CursorLoader { @VisibleForTesting static Uri getContentFilterUri(String query, long directoryId) { - Uri baseUri = - VERSION.SDK_INT >= VERSION_CODES.N - ? ENTERPRISE_CONTENT_FILTER_URI - : Phone.CONTENT_FILTER_URI; - - return baseUri + return ENTERPRISE_CONTENT_FILTER_URI .buildUpon() .appendPath(query) .appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(directoryId)) -- cgit v1.2.3