diff options
| author | zachh <zachh@google.com> | 2018-01-26 10:56:46 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-01-26 12:13:04 -0800 |
| commit | 03b13198537df025febb842db7f95794a1faad8f (patch) | |
| tree | 2e013c45154e63429d9c4db817d07d3e79a06658 /java/com/android/dialer/calllog/database | |
| parent | 268aed51f835788ef44329db50b62b34215b9203 (diff) | |
Added number presentation to AnnotatedCallLog.
Updated the new call log UI to properly show text based on the presentation.
Bug: 70989592
Test: unit
PiperOrigin-RevId: 183414195
Change-Id: I2123f37cd3c733060125b6e894c1a80be4193ad6
Diffstat (limited to 'java/com/android/dialer/calllog/database')
3 files changed, 16 insertions, 2 deletions
diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java index eed77ebed..fea3e91e8 100644 --- a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java +++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java @@ -41,6 +41,7 @@ class AnnotatedCallLogDatabaseHelper extends SQLiteOpenHelper { + (AnnotatedCallLog.TIMESTAMP + " integer, ") + (AnnotatedCallLog.NUMBER + " blob, ") + (AnnotatedCallLog.FORMATTED_NUMBER + " text, ") + + (AnnotatedCallLog.NUMBER_PRESENTATION + " integer, ") + (AnnotatedCallLog.DURATION + " integer, ") + (AnnotatedCallLog.DATA_USAGE + " integer, ") + (AnnotatedCallLog.IS_READ + " integer, ") @@ -54,7 +55,7 @@ class AnnotatedCallLogDatabaseHelper extends SQLiteOpenHelper { + (AnnotatedCallLog.TRANSCRIPTION + " integer, ") + (AnnotatedCallLog.VOICEMAIL_URI + " text, ") + (AnnotatedCallLog.CALL_TYPE + " integer not null, ") - + (AnnotatedCallLog.NUMBER_ATTRIBUTES + " blob ") + + (AnnotatedCallLog.NUMBER_ATTRIBUTES + " blob") + ");"; /** diff --git a/java/com/android/dialer/calllog/database/Coalescer.java b/java/com/android/dialer/calllog/database/Coalescer.java index e301c9f72..ed09eea68 100644 --- a/java/com/android/dialer/calllog/database/Coalescer.java +++ b/java/com/android/dialer/calllog/database/Coalescer.java @@ -156,6 +156,11 @@ public class Coalescer { return false; } + if (!row1.getAsInteger(AnnotatedCallLog.NUMBER_PRESENTATION) + .equals(row2.getAsInteger(AnnotatedCallLog.NUMBER_PRESENTATION))) { + return false; + } + if (!meetsAssistedDialingCriteria(row1, row2)) { return false; } diff --git a/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java b/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java index 96a640918..4fee4e558 100644 --- a/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java +++ b/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java @@ -59,6 +59,13 @@ public class AnnotatedCallLogContract { String FORMATTED_NUMBER = "formatted_number"; /** + * See {@link android.provider.CallLog.Calls#NUMBER_PRESENTATION}. + * + * <p>Type: INTEGER (int) + */ + String NUMBER_PRESENTATION = "presentation"; + + /** * See {@link android.provider.CallLog.Calls#IS_READ}. * * <p>TYPE: INTEGER (boolean) @@ -136,6 +143,7 @@ public class AnnotatedCallLogContract { TIMESTAMP, NUMBER, FORMATTED_NUMBER, + NUMBER_PRESENTATION, IS_READ, NEW, GEOCODED_LOCATION, @@ -145,7 +153,7 @@ public class AnnotatedCallLogContract { PHONE_ACCOUNT_COLOR, FEATURES, NUMBER_ATTRIBUTES, - CALL_TYPE, + CALL_TYPE }; } |