Added a few more columns to annotated call log.

These are mostly columns that are just copied from the system call log.

Also refactored and implemented new logic for displaying call log durations and dates (not used yet).

Bug: 34672501
Test: existing and new
PiperOrigin-RevId: 165387731
Change-Id: I2bc736d848b5c10e42562e62beea64efdeed9c12

5 files changed, 142 insertions, 19 deletions

diff --git a/java/com/android/dialer/calllog/ui/CoalescedAnnotatedCallLogCursorLoader.java b/java/com/android/dialer/calllog/ui/CoalescedAnnotatedCallLogCursorLoader.java
new file mode 100644
index 000000000..e993816bf
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/CoalescedAnnotatedCallLogCursorLoader.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.calllog.ui;
+
+import android.content.Context;
+import android.content.CursorLoader;
+import android.database.Cursor;
+import com.android.dialer.CallTypes;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.CoalescedAnnotatedCallLog;
+import com.google.protobuf.InvalidProtocolBufferException;
+
+/** CursorLoader for the coalesced annotated call log. */
+final class CoalescedAnnotatedCallLogCursorLoader extends CursorLoader {
+
+  /** Indexes for CoalescedAnnotatedCallLog.ALL_COLUMNS */
+  private static final int ID = 0;
+
+  private static final int TIMESTAMP = 1;
+  private static final int PRIMARY_TEXT = 2;
+  private static final int CONTACT_PHOTO_URI = 3;
+  private static final int NUMBER_TYPE_LABEL = 4;
+  private static final int IS_READ = 5;
+  private static final int GEOCODED_LOCATION = 6;
+  private static final int PHONE_ACCOUNT_LABEL = 7;
+  private static final int PHONE_ACCOUNT_COLOR = 8;
+  private static final int FEATURES = 9;
+  private static final int IS_BUSINESS = 10;
+  private static final int IS_VOICEMAIL = 11;
+  private static final int NUMBER_CALLS = 12;
+  private static final int FORMATTED_NUMBER = 13;
+  private static final int CALL_TYPES = 14;
+
+  /** Convenience class for accessing values using an abbreviated syntax. */
+  static final class Row {
+    private final Cursor cursor;
+
+    Row(Cursor cursor) {
+      this.cursor = cursor;
+    }
+
+    long id() {
+      return cursor.getInt(ID);
+    }
+
+    long timestamp() {
+      return cursor.getLong(TIMESTAMP);
+    }
+
+    String primaryText() {
+      return cursor.getString(PRIMARY_TEXT);
+    }
+
+    String contactPhotoUri() {
+      return cursor.getString(CONTACT_PHOTO_URI);
+    }
+
+    String numberTypeLabel() {
+      return cursor.getString(NUMBER_TYPE_LABEL);
+    }
+
+    boolean isRead() {
+      return cursor.getInt(IS_READ) == 1;
+    }
+
+    String geocodedLocation() {
+      return cursor.getString(GEOCODED_LOCATION);
+    }
+
+    String phoneAccountLabel() {
+      return cursor.getString(PHONE_ACCOUNT_LABEL);
+    }
+
+    int phoneAccountColor() {
+      return cursor.getInt(PHONE_ACCOUNT_COLOR);
+    }
+
+    int features() {
+      return cursor.getInt(FEATURES);
+    }
+
+    boolean isBusiness() {
+      return cursor.getInt(IS_BUSINESS) == 1;
+    }
+
+    boolean isVoicemail() {
+      return cursor.getInt(IS_VOICEMAIL) == 1;
+    }
+
+    int numberCalls() {
+      return cursor.getInt(NUMBER_CALLS);
+    }
+
+    String formattedNumber() {
+      return cursor.getString(FORMATTED_NUMBER);
+    }
+
+    CallTypes callTypes() throws InvalidProtocolBufferException {
+      return CallTypes.parseFrom(cursor.getBlob(CALL_TYPES));
+    }
+  }
+
+  CoalescedAnnotatedCallLogCursorLoader(Context context) {
+    // CoalescedAnnotatedCallLog requires that PROJECTION be ALL_COLUMNS and the following params be
+    // null.
+    super(
+        context,
+        CoalescedAnnotatedCallLog.CONTENT_URI,
+        CoalescedAnnotatedCallLog.ALL_COLUMNS,
+        null,
+        null,
+        null);
+  }
+}
diff --git a/java/com/android/dialer/calllog/ui/NewCallLogAdapter.java b/java/com/android/dialer/calllog/ui/NewCallLogAdapter.java
index f9ab21cb3..4655b0982 100644
--- a/java/com/android/dialer/calllog/ui/NewCallLogAdapter.java
+++ b/java/com/android/dialer/calllog/ui/NewCallLogAdapter.java
@@ -19,17 +19,14 @@ import android.database.Cursor;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
-import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.CoalescedAnnotatedCallLog;
 
 /** {@link RecyclerView.Adapter} for the new call log fragment. */
 final class NewCallLogAdapter extends RecyclerView.Adapter<NewCallLogViewHolder> {
 
   private final Cursor cursor;
-  private final int timestampIndex;
 
   NewCallLogAdapter(Cursor cursor) {
     this.cursor = cursor;
-    timestampIndex = cursor.getColumnIndexOrThrow(CoalescedAnnotatedCallLog.TIMESTAMP);
   }
 
   @Override
@@ -42,8 +39,7 @@ final class NewCallLogAdapter extends RecyclerView.Adapter<NewCallLogViewHolder>
   @Override
   public void onBindViewHolder(NewCallLogViewHolder viewHolder, int position) {
     cursor.moveToPosition(position);
-    long timestamp = cursor.getLong(timestampIndex);
-    viewHolder.bind(timestamp);
+    viewHolder.bind(cursor);
   }
 
   @Override
diff --git a/java/com/android/dialer/calllog/ui/NewCallLogFragment.java b/java/com/android/dialer/calllog/ui/NewCallLogFragment.java
index 17fcf1939..c4bcb766b 100644
--- a/java/com/android/dialer/calllog/ui/NewCallLogFragment.java
+++ b/java/com/android/dialer/calllog/ui/NewCallLogFragment.java
@@ -17,7 +17,6 @@ package com.android.dialer.calllog.ui;
 
 import android.app.Fragment;
 import android.app.LoaderManager.LoaderCallbacks;
-import android.content.CursorLoader;
 import android.content.Loader;
 import android.database.Cursor;
 import android.os.Bundle;
@@ -29,7 +28,6 @@ import android.view.ViewGroup;
 import com.android.dialer.calllog.CallLogComponent;
 import com.android.dialer.calllog.CallLogFramework;
 import com.android.dialer.calllog.CallLogFramework.CallLogUi;
-import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.CoalescedAnnotatedCallLog;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
@@ -133,9 +131,7 @@ public final class NewCallLogFragment extends Fragment
   @Override
   public Loader<Cursor> onCreateLoader(int id, Bundle args) {
     LogUtil.enterBlock("NewCallLogFragment.onCreateLoader");
-    // CoalescedAnnotatedCallLog requires that all params be null.
-    return new CursorLoader(
-        getContext(), CoalescedAnnotatedCallLog.CONTENT_URI, null, null, null, null);
+    return new CoalescedAnnotatedCallLogCursorLoader(getContext());
   }
 
   @Override
diff --git a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java
index 9521a032c..72ea17b03 100644
--- a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java
+++ b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java
@@ -15,6 +15,7 @@
  */
 package com.android.dialer.calllog.ui;
 
+import android.database.Cursor;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
@@ -27,17 +28,20 @@ final class NewCallLogViewHolder extends RecyclerView.ViewHolder {
   // TODO(zachh): Format correctly using current locale.
   private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.US);
 
-  private final TextView contactNameView;
-  private final TextView timestampView;
+  private final TextView primaryTextView;
+  private final TextView secondaryTextView;
 
   NewCallLogViewHolder(View view) {
     super(view);
-    contactNameView = view.findViewById(R.id.contact_name);
-    timestampView = view.findViewById(R.id.timestamp);
+    primaryTextView = view.findViewById(R.id.primary_text);
+    secondaryTextView = view.findViewById(R.id.secondary_text);
   }
 
-  void bind(long timestamp) {
-    contactNameView.setText("Contact Name Placeholder");
-    timestampView.setText(dateFormat.format(timestamp));
+  /** @param cursor a cursor from {@link CoalescedAnnotatedCallLogCursorLoader}. */
+  void bind(Cursor cursor) {
+    CoalescedAnnotatedCallLogCursorLoader.Row row =
+        new CoalescedAnnotatedCallLogCursorLoader.Row(cursor);
+    primaryTextView.setText(row.primaryText());
+    secondaryTextView.setText(dateFormat.format(row.timestamp()));
   }
 }
diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
index 99797fab4..38e07becf 100644
--- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
+++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
@@ -23,13 +23,13 @@
     android:orientation="vertical">
 
   <TextView
-      android:id="@+id/contact_name"
+      android:id="@+id/primary_text"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       style="@style/PrimaryText"/>
 
   <TextView
-      android:id="@+id/timestamp"
+      android:id="@+id/secondary_text"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       style="@style/SecondaryText"/>