diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-09 16:40:28 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-09 16:40:28 +0000 |
commit | 8c19b0ac8f79eb7f653ee3e07018ca7342f4e190 (patch) | |
tree | 92e2a480370fd53fdb210d1035a6c3d666628819 /java/com/android/dialer/app | |
parent | 455a7c27d5c5d4c25236d940f088a25a5bf57c2a (diff) | |
parent | 517fbff5c15c9270323b4099a39514d2487eec99 (diff) |
Merge changes Iddf5ef33,I1b718e30,I0c7386f6,I81069948,I3bec477d, ...
* changes:
Update strings for Duo "Set up" and "Invite" buttons
Hide emergency calls in the call log
Simplifying implementation of the coalescing logic in the new call log.
Updating Dialer v16 licenses.
Use ContactsContract.PhoneLookup for invalid numbers in Cp2PhoneLookup.
Add RTT call chat window.
Updated T9 search bolding to include wrapping to the next word.
Initial setup of voicemail error messages
Automated rollback of changelist 178323108
Add "delete" option in the 3-dot menu of the new call log
Diffstat (limited to 'java/com/android/dialer/app')
-rw-r--r-- | java/com/android/dialer/app/calllog/CallLogAdapter.java | 13 | ||||
-rw-r--r-- | java/com/android/dialer/app/res/values/strings.xml | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index 261b0ec94..963967ffc 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -39,6 +39,7 @@ import android.support.v7.app.AlertDialog; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView.ViewHolder; import android.telecom.PhoneAccountHandle; +import android.telephony.PhoneNumberUtils; import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; @@ -802,7 +803,7 @@ public class CallLogAdapter extends GroupingListAdapter int groupSize = getGroupSize(position); CallDetailsEntries callDetailsEntries = createCallDetailsEntries(c, groupSize); PhoneCallDetails details = createPhoneCallDetails(c, groupSize, views); - if (hiddenRowIds.contains(c.getLong(CallLogQuery.ID))) { + if (isHiddenRow(views.number, c.getLong(CallLogQuery.ID))) { views.callLogEntryView.setVisibility(View.GONE); views.dayGroupHeader.setVisibility(View.GONE); return; @@ -827,6 +828,16 @@ public class CallLogAdapter extends GroupingListAdapter } } + private boolean isHiddenRow(@Nullable String number, long rowId) { + if (number != null && PhoneNumberUtils.isEmergencyNumber(number)) { + return true; + } + if (hiddenRowIds.contains(rowId)) { + return true; + } + return false; + } + private void loadAndRender( final CallLogListItemViewHolder viewHolder, final long rowId, diff --git a/java/com/android/dialer/app/res/values/strings.xml b/java/com/android/dialer/app/res/values/strings.xml index 99720c2a6..9554fc21b 100644 --- a/java/com/android/dialer/app/res/values/strings.xml +++ b/java/com/android/dialer/app/res/values/strings.xml @@ -351,12 +351,12 @@ <!-- Button text for the "Set up" video calling option displayed underneath an entry in the call log. Tapping causes a the user to be taken to set up video calling. [CHAR LIMIT=30] --> - <string name="call_log_action_set_up_video">Set up</string> + <string name="call_log_action_set_up_video">Set up video calling</string> <!-- Button text for the "Invite" option displayed underneath an entry in the call log. Tapping causes a the user to be taken to the messaging app with a message ready to invite them to set up video calling. [CHAR LIMIT=30] --> - <string name="call_log_action_invite_video">Invite</string> + <string name="call_log_action_invite_video">Invite to video call</string> <!-- Button text for a button displayed underneath an entry in the call log, which opens up a messaging app to send a SMS to the number represented by the call log entry. |