From 5b4becb8ca9cc6249d0cf0a074bf63d6999f3b5e Mon Sep 17 00:00:00 2001 From: wangqi Date: Tue, 20 Jun 2017 11:23:41 -0700 Subject: Automated g4 rollback of changelist 158923709. *** Reason for rollback *** It's not necessary anymore after we verified it could be controlled from server side. *** Original change description *** Flip flag to enable ReturnToCall bubble. Enables ReturnToCall bubble and changes the name of the flag so that it can be toggled independently from previous versions. *** Also in the change: Restore TODOs Test: TH PiperOrigin-RevId: 159587541 Change-Id: I88f01550f07a7859f41b4f0fc843e92b38f5a85b --- .../dialer/searchfragment/cp2/SearchContactCursor.java | 2 +- .../dialer/searchfragment/cp2/SearchContactViewHolder.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'java/com/android/dialer/searchfragment/cp2') diff --git a/java/com/android/dialer/searchfragment/cp2/SearchContactCursor.java b/java/com/android/dialer/searchfragment/cp2/SearchContactCursor.java index a2ef58c3c..51992646a 100644 --- a/java/com/android/dialer/searchfragment/cp2/SearchContactCursor.java +++ b/java/com/android/dialer/searchfragment/cp2/SearchContactCursor.java @@ -67,7 +67,7 @@ public final class SearchContactCursor implements Cursor { * @param query to filter cursor results. */ public SearchContactCursor(Cursor cursor, @Nullable String query) { - // TODO investigate copying this into a MatrixCursor and holding in memory + // TODO(calderwoodra) investigate copying this into a MatrixCursor and holding in memory this.cursor = cursor; filter(query); } diff --git a/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java b/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java index 5f06b5991..d3df02f79 100644 --- a/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java +++ b/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java @@ -127,8 +127,8 @@ public final class SearchContactViewHolder extends ViewHolder implements OnClick return Contacts.getLookupUri(contactId, lookupKey); } - // TODO: handle CNAP and cequint types. - // TODO: unify this into a utility method with CallLogAdapter#getNumberType + // TODO(calderwoodra): handle CNAP and cequint types. + // TODO(calderwoodra): unify this into a utility method with CallLogAdapter#getNumberType private static String getLabel(Resources resources, Cursor cursor) { int numberType = cursor.getInt(Projections.PHONE_TYPE); String numberLabel = cursor.getString(Projections.PHONE_LABEL); @@ -171,7 +171,7 @@ public final class SearchContactViewHolder extends ViewHolder implements OnClick return CallToAction.VIDEO_CALL; } - // TODO: enriched calling + // TODO(calderwoodra): enriched calling return CallToAction.NONE; } @@ -183,13 +183,13 @@ public final class SearchContactViewHolder extends ViewHolder implements OnClick callToActionView.setVisibility(View.VISIBLE); callToActionView.setImageDrawable( context.getDrawable(com.android.contacts.common.R.drawable.ic_phone_attach)); - // TODO: open call composer. + // TODO(calderwoodra): open call composer. break; case CallToAction.VIDEO_CALL: callToActionView.setVisibility(View.VISIBLE); callToActionView.setImageDrawable( context.getDrawable(R.drawable.quantum_ic_videocam_white_24)); - // TODO: place a video call + // TODO(calderwoodra): place a video call break; case CallToAction.NONE: default: @@ -197,7 +197,7 @@ public final class SearchContactViewHolder extends ViewHolder implements OnClick "Invalid Call to action type: " + currentAction); } } else { - // TODO: set the correct call initiation type. + // TODO(calderwoodra): set the correct call initiation type. TelecomUtil.placeCall(context, new CallIntentBuilder(number, Type.REGULAR_SEARCH).build()); } } -- cgit v1.2.3