From 3865d300feeab8c7695762e86004804c052577ae Mon Sep 17 00:00:00 2001 From: linyuh Date: Mon, 16 Apr 2018 13:07:20 -0700 Subject: Remove column PHONE_ACCOUNT_LABEL and PHONE_ACCOUNT_COLOR from the annotated call log. Bug: 77808449 Test: NewCallLogViewHolderTest + existing tests for the call log framework PiperOrigin-RevId: 193086917 Change-Id: I39244c69acf1d261699610f6010c0cf147ca3492 --- .../android/dialer/calllog/model/coalesced_row.proto | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'java/com/android/dialer/calllog/model') diff --git a/java/com/android/dialer/calllog/model/coalesced_row.proto b/java/com/android/dialer/calllog/model/coalesced_row.proto index 3cb10e7a6..913f07298 100644 --- a/java/com/android/dialer/calllog/model/coalesced_row.proto +++ b/java/com/android/dialer/calllog/model/coalesced_row.proto @@ -12,7 +12,7 @@ import "java/com/android/dialer/calllog/database/contract/number_attributes.prot import "java/com/android/dialer/phonenumberproto/dialer_phone_number.proto"; // Contains the contents of a row from the CoalescedAnnotatedCallLog. -// Next ID: 19 +// Next ID: 17 message CoalescedRow { // Value in column CoalescedAnnotatedCallLog._ID optional int64 id = 1; @@ -44,27 +44,21 @@ message CoalescedRow { // Value in column CoalescedAnnotatedCallLog.PHONE_ACCOUNT_ID optional string phone_account_id = 10; - // Value in column CoalescedAnnotatedCallLog.PHONE_ACCOUNT_LABEL - optional string phone_account_label = 11; - - // Value in column CoalescedAnnotatedCallLog.PHONE_ACCOUNT_COLOR - optional int32 phone_account_color = 12; - // Value in column CoalescedAnnotatedCallLog.FEATURES - optional int32 features = 13; + optional int32 features = 11; // Value in column CoalescedAnnotatedCallLog.CALL_TYPE - optional int32 call_type = 14; + optional int32 call_type = 12; // Value in column CoalescedAnnotatedCallLog.NUMBER_ATTRIBUTES - optional com.android.dialer.NumberAttributes number_attributes = 15; + optional com.android.dialer.NumberAttributes number_attributes = 13; // Value in column CoalescedAnnotatedCallLog.IS_VOICEMAIL_CALL - optional bool is_voicemail_call = 16; + optional bool is_voicemail_call = 14; // Value in column CoalescedAnnotatedCallLog.VOICEMAIL_CALL_TAG - optional string voicemail_call_tag = 17; + optional string voicemail_call_tag = 15; // Value in column CoalescedAnnotatedCallLog.COALESCED_IDS - optional com.android.dialer.CoalescedIds coalesced_ids = 18; + optional com.android.dialer.CoalescedIds coalesced_ids = 16; } -- cgit v1.2.3