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 --- java/com/android/dialer/app/DialtactsActivity.java | 8 ++++---- java/com/android/dialer/app/calllog/CallLogAdapter.java | 2 +- java/com/android/dialer/app/contactinfo/ContactInfoCache.java | 2 +- java/com/android/dialer/app/voicemail/VoicemailErrorManager.java | 2 +- .../com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java | 2 +- .../dialer/app/voicemail/error/VoicemailTosMessageCreator.java | 4 ++-- .../dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'java/com/android/dialer/app') diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java index 527dbff18..fd685816e 100644 --- a/java/com/android/dialer/app/DialtactsActivity.java +++ b/java/com/android/dialer/app/DialtactsActivity.java @@ -284,7 +284,7 @@ public class DialtactsActivity extends TransactionSafeActivity } mSearchQuery = newText; - // TODO: show p13n when newText is empty. + // TODO(calderwoodra): show p13n when newText is empty. // Show search fragment only when the query string is changed to non-empty text. if (!TextUtils.isEmpty(newText)) { // Call enterSearchUi only if we are switching search modes, or showing a search @@ -595,7 +595,7 @@ public class DialtactsActivity extends TransactionSafeActivity new P13nRefreshCompleteListener() { @Override public void onP13nRefreshComplete() { - // TODO: make zero-query search results visible + // TODO(strongarm): make zero-query search results visible } }); Trace.endSection(); @@ -1152,7 +1152,7 @@ public class DialtactsActivity extends TransactionSafeActivity } transaction.add(R.id.dialtacts_frame, fragment, tag); } else { - // TODO: if this is a transition from dialpad to searchbar, animate fragment + // TODO(calderwoodra): if this is a transition from dialpad to searchbar, animate fragment // down, and vice versa. Perhaps just add a coordinator behavior with the search bar. transaction.show(fragment); } @@ -1165,7 +1165,7 @@ public class DialtactsActivity extends TransactionSafeActivity ((SearchFragment) fragment) .setShowEmptyListForNullQuery(mP13nRanker.shouldShowEmptyListForNullQuery()); } else { - // TODO: add p13n ranker to new search. + // TODO(calderwoodra): add p13n ranker to new search. } if (!smartDialSearch && !useNewSearch) { diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index f1d051a8c..b0afec1a7 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -416,7 +416,7 @@ public class CallLogAdapter extends GroupingListAdapter * Holds a list of URIs that are pending deletion or undo. If the activity ends before the undo * timeout, all of the pending URIs will be deleted. * - *

TODO: move this and OnVoicemailDeletedListener to somewhere like {@link + *

TODO(twyen): move this and OnVoicemailDeletedListener to somewhere like {@link * VisualVoicemailCallLogFragment}. The CallLogAdapter does not need to know about what to do with * hidden item or what to hide. */ diff --git a/java/com/android/dialer/app/contactinfo/ContactInfoCache.java b/java/com/android/dialer/app/contactinfo/ContactInfoCache.java index 82fc229af..155a6a2eb 100644 --- a/java/com/android/dialer/app/contactinfo/ContactInfoCache.java +++ b/java/com/android/dialer/app/contactinfo/ContactInfoCache.java @@ -163,7 +163,7 @@ public class ContactInfoCache { if (request.isLocalRequest()) { info = mContactInfoHelper.lookupNumber(request.number, request.countryIso); if (info != null && !info.contactExists) { - // TODO: Maybe skip look up if it's already available in cached number lookup + // TODO(wangqi): Maybe skip look up if it's already available in cached number lookup // service. long start = SystemClock.elapsedRealtime(); mContactInfoHelper.updateFromCequintCallerId(mCequintCallerIdManager, info, request.number); diff --git a/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java b/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java index a0bae36cc..bc6ffb5a7 100644 --- a/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java +++ b/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java @@ -92,7 +92,7 @@ public class VoicemailErrorManager implements CallLogQueryHandler.Listener, Voic } } alertItem.updateStatus(statuses, this); - // TODO: b/30668323 support error from multiple sources. + // TODO(twyen): b/30668323 support error from multiple sources. return; } diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java index f160e024e..9c1e446ab 100644 --- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java +++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java @@ -85,7 +85,7 @@ public class VoicemailPlaybackLayout extends LinearLayout // When the undo button is pressed, the viewHolder we have is no longer valid because when // we hide the view it is binded to something else, and the layout is not updated for // hidden items. copy the adapter position so we can update the view upon undo. - // TODO: refactor this so the view holder will always be valid. + // TODO(twyen): refactor this so the view holder will always be valid. final int adapterPosition = mViewHolder.getAdapterPosition(); mPresenter.pausePlayback(); diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java index 3f0ed1f58..cf6564a74 100644 --- a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java +++ b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java @@ -72,11 +72,11 @@ public class VoicemailTosMessageCreator { @Nullable VoicemailErrorMessage maybeCreateTosMessage() { - // TODO: add filtering based on carrier + // TODO(mdooley): add filtering based on carrier if (hasAcceptedTos()) { return null; } - // TODO: temporarily skip the terms of service for dogfood builds + // TODO(mdooley): temporarily skip the terms of service for dogfood builds if (BuildType.get() == BuildType.DOGFOOD) { LogUtil.i( "VoicemailTosMessageCreator.maybeCreateTosMessage", diff --git a/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java b/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java index e639eff23..d3024f4c5 100644 --- a/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java +++ b/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java @@ -259,7 +259,7 @@ public class Vvm3VoicemailMessageCreator { @NonNull private static CharSequence getCustomerSupportString(Context context, int id) { - // TODO: get number based on the country the user is currently in. + // TODO(twyen): get number based on the country the user is currently in. return ContactDisplayUtils.getTtsSpannedPhoneNumber( context.getResources(), id, -- cgit v1.2.3