diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-27 23:20:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-27 23:20:36 +0000 |
| commit | 79eb6bd9693a0042943d66648f0d8768cb15dfb6 (patch) | |
| tree | 8d3056e45514b451c94898c3731ccb700f43e5a4 /java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java | |
| parent | ffdd9c7513dfe72e02722889baaaab241d244d8c (diff) | |
| parent | c3d3c3dfbcf96f6db92b747463ac84ee244a0c85 (diff) | |
Merge "Move DirectoryCompat from "contacts/common" to "dialer/common/cp2"."
Diffstat (limited to 'java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java')
| -rw-r--r-- | java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java b/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java index fc5bce1b2..aef1e9ece 100644 --- a/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java +++ b/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java @@ -29,9 +29,9 @@ import android.view.View; import android.widget.ImageView; import android.widget.QuickContactBadge; import android.widget.TextView; -import com.android.contacts.common.compat.DirectoryCompat; import com.android.dialer.callintent.CallInitiationType; import com.android.dialer.callintent.CallIntentBuilder; +import com.android.dialer.common.cp2.DirectoryCompat; import com.android.dialer.contactphoto.ContactPhotoManager; import com.android.dialer.lettertile.LetterTileDrawable; import com.android.dialer.precall.PreCall; @@ -73,14 +73,11 @@ public final class DirectoryContactViewHolder extends RecyclerView.ViewHolder String secondaryInfo = TextUtils.isEmpty(label) ? number - : context.getString( - com.android.contacts.common.R.string.call_subject_type_and_number, label, number); + : context.getString(R.string.call_subject_type_and_number, label, number); nameView.setText(QueryBoldingUtil.getNameWithQueryBolded(query, name, context)); numberView.setText(QueryBoldingUtil.getNameWithQueryBolded(query, secondaryInfo, context)); workBadge.setVisibility( - // TODO(a bug): Consider moving DirectoryCompat out of "contacts/common" and share it - // with PhoneLookups. DirectoryCompat.isOnlyEnterpriseDirectoryId(cursor.getDirectoryId()) ? View.VISIBLE : View.GONE); |