Merge "Revert "Prepatory CallDetailActivity tweaks."" into ub-contactsdialer-a-dev

6 files changed, 44 insertions, 9 deletions

diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml
index 591ba5c45..fde1de5c1 100644
--- a/res/layout/call_detail.xml
+++ b/res/layout/call_detail.xml
@@ -60,8 +60,7 @@
                 android:textColor="?attr/call_log_primary_text_color"
                 android:textSize="@dimen/call_log_primary_text_size"
                 android:includeFontPadding="false"
-                android:layout_marginTop="2dp"
-                android:layout_marginBottom="3dp"
+                android:layout_marginBottom="5dp"
                 android:singleLine="true" />
 
             <TextView
diff --git a/res/layout/call_detail_history_header.xml b/res/layout/call_detail_history_header.xml
new file mode 100644
index 000000000..def1fd805
--- /dev/null
+++ b/res/layout/call_detail_history_header.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ex="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/call_detail_header_top_margin"
+    android:paddingBottom="@dimen/call_detail_header_bottom_margin"
+    android:paddingStart="@dimen/call_detail_horizontal_margin"
+    android:textColor="?attr/call_log_secondary_text_color"
+    android:textSize="@dimen/call_log_secondary_text_size"
+    android:fontFamily="sans-serif-medium"
+    android:singleLine="true"
+    android:text="@string/call_detail_list_header"
+    />
diff --git a/res/menu/call_details_options.xml b/res/menu/call_details_options.xml
index 414b6711a..0e9e5c9d0 100644
--- a/res/menu/call_details_options.xml
+++ b/res/menu/call_details_options.xml
@@ -16,6 +16,16 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/call_details_menu">
 
+    <item android:id="@+id/menu_trash"
+        android:icon="@drawable/ic_delete_24dp"
+        android:showAsAction="ifRoom"
+        android:title="@string/call_log_trash_voicemail" />
+
+    <item android:id="@+id/menu_remove_from_call_log"
+        android:icon="@drawable/ic_delete_24dp"
+        android:showAsAction="ifRoom"
+        android:title="@string/call_log_remove_from_call_log" />
+
     <item android:id="@+id/menu_edit_number_before_call"
         android:title="@string/call_log_edit_number_before_call" />
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d35a78d12..0a330d8a4 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -39,9 +39,9 @@
     <!-- Size of contact photos in the call log and call details. -->
     <dimen name="contact_photo_size">40dp</dimen>
     <dimen name="call_detail_button_spacing">2dip</dimen>
-    <dimen name="call_detail_horizontal_margin">20dp</dimen>
-    <dimen name="call_detail_top_margin">16dp</dimen>
-    <dimen name="call_detail_bottom_margin">16dp</dimen>
+    <dimen name="call_detail_horizontal_margin">16dp</dimen>
+    <dimen name="call_detail_top_margin">36dp</dimen>
+    <dimen name="call_detail_bottom_margin">32dp</dimen>
     <dimen name="call_detail_header_top_margin">20dp</dimen>
     <dimen name="call_detail_header_bottom_margin">9dp</dimen>
     <dimen name="call_detail_translation_z">0.5dp</dimen>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index f850327ea..f96761a81 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -15,7 +15,6 @@
 -->
 
 <resources>
-    <item type="id" name="call_detail_delete_menu_item" />
     <item type="id" name="context_menu_copy_to_clipboard" />
     <item type="id" name="context_menu_copy_transcript_to_clipboard" />
     <item type="id" name="context_menu_edit_before_call" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b2621cd9e..d51ff6d72 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -70,9 +70,6 @@
     <!-- Text for undo button in snackbar for blocking/unblocking number. [CHAR LIMIT=10] -->
     <string name="block_number_undo">UNDO</string>
 
-    <!-- Menu item in call details used to remove a call or voicemail from the call log. -->
-    <string name="call_details_delete">Delete</string>
-
     <!-- Menu item used to copy a number from the call log to the dialer so it can be edited before calling it -->
     <string name="call_log_edit_number_before_call">Edit number before call</string>