diff options
author | zachh <zachh@google.com> | 2017-08-25 12:19:07 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-08-30 16:26:55 -0700 |
commit | 51f2b28ae6a45f57f94e5c9a66081a10aebc8349 (patch) | |
tree | 51f16d3431b9e7aeeed3719303b00fca20cb7d88 /java/com/android/dialer/calllog/database/Coalescer.java | |
parent | 73f450c63cae19c7e0404fcddbc8db55a1aa5fba (diff) |
Added partial UI to new call log.
UI notes:
-Updated view holder to show number and basic secondary text
-Updated adapter to divide "Today" and "Older" entries
-Photo is just an anonymous avatar for now
-Clicking anywhere is a no-op
Other things done in this CL:
-Plumbed a few more columns through the call log framework
-Tweaked some column names in the data model (contract)
-Cleaned up some existing tests and added some new ones
Screenshot:
https://screenshot.googleplex.com/DiMscW47AYb
This is the complete spec I am working from:
https://screenshot.googleplex.com/XLquTek1oHk
Bug: 34672501
Test: existing and new
Change-Id: Ice0e538e23e59b7d752f47125a5f9da96bf91430
PiperOrigin-RevId: 166508997
Diffstat (limited to 'java/com/android/dialer/calllog/database/Coalescer.java')
-rw-r--r-- | java/com/android/dialer/calllog/database/Coalescer.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/java/com/android/dialer/calllog/database/Coalescer.java b/java/com/android/dialer/calllog/database/Coalescer.java index 23ddc9c21..55bed3e8c 100644 --- a/java/com/android/dialer/calllog/database/Coalescer.java +++ b/java/com/android/dialer/calllog/database/Coalescer.java @@ -133,8 +133,16 @@ public class Coalescer { DialerPhoneNumber number1; DialerPhoneNumber number2; try { - number1 = DialerPhoneNumber.parseFrom(row1.getAsByteArray(AnnotatedCallLog.NUMBER)); - number2 = DialerPhoneNumber.parseFrom(row2.getAsByteArray(AnnotatedCallLog.NUMBER)); + byte[] number1Bytes = row1.getAsByteArray(AnnotatedCallLog.NUMBER); + byte[] number2Bytes = row2.getAsByteArray(AnnotatedCallLog.NUMBER); + + if (number1Bytes == null || number2Bytes == null) { + // Empty numbers should not be combined. + return false; + } + + number1 = DialerPhoneNumber.parseFrom(number1Bytes); + number2 = DialerPhoneNumber.parseFrom(number2Bytes); } catch (InvalidProtocolBufferException e) { throw Assert.createAssertionFailException("error parsing DialerPhoneNumber proto", e); } |