Merge "Adding day group headings in the call log which group call log entries under 4 headings, "Today", "Yesterday", "Last week", "Other"."

4 files changed, 31 insertions, 21 deletions

diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml
index b4714a333..5cddbe749 100644
--- a/res/layout/call_log_fragment.xml
+++ b/res/layout/call_log_fragment.xml
@@ -61,13 +61,17 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+        <!-- clipChildren=true is required to ensure shadows on elevated call log entries are not
+             clipped.-->
         <ListView android:id="@android:id/list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:fadingEdge="none"
             android:scrollbarStyle="outsideOverlay"
             android:divider="@null"
-            android:nestedScrollingEnabled="true" />
+            android:nestedScrollingEnabled="true"
+            android:clipChildren="false"
+        />
         <TextView android:id="@android:id/empty"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index 6068bd817..b36101e55 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -22,20 +22,23 @@
     android:id="@+id/call_log_list_item"
     android:orientation="vertical"
 >
-    <!--
-        This layout may represent either a call log item or one of the
-        headers in the call log.
-
-        The former will make the @id/call_log_item visible and the
-        @id/call_log_header gone.
-
-        The latter will make the @id/call_log_header visible and the
-        @id/call_log_item gone
-    -->
-
+    <!-- Day group heading. Used to show a "today", "yesterday", "last week" or "other" heading
+         above a group of call log entries. -->
+    <TextView
+        android:id="@+id/call_log_day_group_label"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/call_log_outer_margin"
+        android:layout_marginEnd="@dimen/call_log_outer_margin"
+        android:textColor="?attr/call_log_secondary_text_color"
+        android:textSize="@dimen/call_log_secondary_text_size"
+        android:paddingTop="@dimen/call_log_day_group_padding"
+        android:paddingBottom="0dp"
+        />
     <!-- Linear layout to separate the primary area containing the contact badge and caller
          information and the secondary action (call details / play voicemail). -->
     <LinearLayout
+        android:id="@+id/call_log_row"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:baselineAligned="false"
@@ -127,14 +130,6 @@
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"/>
     </LinearLayout>
-    <TextView
-        android:id="@+id/call_log_header"
-        style="@style/ContactListSeparatorTextViewStyle"
-        android:layout_marginStart="@dimen/call_log_outer_margin"
-        android:layout_marginEnd="@dimen/call_log_outer_margin"
-        android:paddingTop="@dimen/call_log_inner_margin"
-        android:paddingBottom="@dimen/call_log_inner_margin" />
-
     <!-- Displays the extra link section -->
     <ViewStub android:id="@+id/link_stub"
               android:layout="@layout/call_log_list_item_extra"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 89bd5927b..ae653303c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -130,4 +130,6 @@
     <dimen name="call_log_action_height">48dp</dimen>
     <!-- Elevation of expanded call log items. -->
     <dimen name="call_log_expanded_elevation">4dp</dimen>
+    <!-- Padding above call log day group headers. -->
+    <dimen name="call_log_day_group_padding">16dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d6d4766fe..4215f5367 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -718,6 +718,15 @@
          [CHAR LIMIT=NONE] -->
     <string name="description_delete_action">Delete call log entry for <xliff:g id="nameOrNumber" example="John Smith">%1$s</xliff:g></string>
 
-    <!-- Toast message which appears when a call log entry is deleted. -->
+    <!-- Toast message which appears when a call log entry is deleted.
+         [CHAR LIMIT=NONE] -->
     <string name="toast_entry_removed">Call log entry deleted.</string>
+
+    <!-- String used as a header in the call log above calls which occurred last week.
+         [CHAR LIMIT=65] -->
+    <string name="call_log_header_last_week">Last week</string>
+
+    <!-- String used as a header in the call log above calls which ocurred more than a week ago.
+         [CHAR LIMIT=65] -->
+    <string name="call_log_header_other">Other</string>
 </resources>