Removing the delete button from call log entries.

Bug: 13962594
Change-Id: I59ee9badc239f4ce3a81320cb0e801af973707a5

3 files changed, 1 insertions, 34 deletions

diff --git a/res/layout/call_log_list_item_actions.xml b/res/layout/call_log_list_item_actions.xml
index d4e98d0c0..9ee9a0fa5 100644
--- a/res/layout/call_log_list_item_actions.xml
+++ b/res/layout/call_log_list_item_actions.xml
@@ -57,22 +57,6 @@
             android:textColor="@color/call_log_action_text"
             android:textSize="@dimen/call_log_secondary_text_size"
             android:nextFocusLeft="@+id/call_back_action"
-            android:nextFocusRight="@+id/delete_action"
-            android:focusable="true"
-            android:singleLine="true"/>
-        <TextView
-            android:id="@+id/delete_action"
-            android:background="@drawable/action_button_background"
-            android:fontFamily="sans-serif-medium"
-            android:gravity="center"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:paddingLeft="@dimen/call_log_action_horizontal_padding"
-            android:paddingRight="@dimen/call_log_action_horizontal_padding"
-            android:text="@string/call_log_action_delete"
-            android:textColor="@color/call_log_action_delete_text"
-            android:textSize="@dimen/call_log_secondary_text_size"
-            android:nextFocusLeft="@+id/voicemail_action"
             android:nextFocusRight="@+id/details_action"
             android:focusable="true"
             android:singleLine="true"/>
@@ -88,7 +72,7 @@
             android:text="@string/call_log_action_details"
             android:textColor="?attr/call_log_secondary_text_color"
             android:textSize="@dimen/call_log_secondary_text_size"
-            android:nextFocusLeft="@+id/delete_action"
+            android:nextFocusLeft="@+id/voicemail_action"
             android:nextFocusRight="@+id/primary_action_view"
             android:focusable="true"
             android:singleLine="true"/>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7d5ef717e..1e2958f59 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -95,12 +95,6 @@
          as call back, play voicemail, etc. -->
     <color name="call_log_action_text">#1dc7db</color>
 
-    <!-- Color of the "delete" action in expanded call log entries. -->
-    <color name="call_log_action_delete_text">#ff4f4f</color>
-
-    <!-- Color of action text for expanded call log entries which is disabled. -->
-    <color name="call_log_disabled_text">#b3b3b3</color>
-
     <!-- Color for missed call icons. -->
     <color name="missed_call">#ff2e58</color>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0f66131dc..db41d310d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -662,11 +662,6 @@
          [CHAR LIMIT=30] -->
     <string name="call_log_action_call_back">CALL BACK</string>
 
-    <!-- Button text for the "DELETE" button displayed underneath an entry in the call log.
-         Tapping causes the call log entry in question to be removed from the call log.
-         [CHAR LIMIT=30] -->
-    <string name="call_log_action_delete">DELETE</string>
-
     <!-- Button text for the "LISTEN" button displayed underneath an entry in the call log.
          Tapping navigates the user to the call details screen where the user can listen to the
          voicemail represented by the call log entry.
@@ -707,12 +702,6 @@
          [CHAR LIMIT=NONE] -->
     <string name="description_voicemail_action">Listen to voicemail from <xliff:g id="nameOrNumber" example="John Smith">%1$s</xliff:g></string>
 
-    <!-- String describing the "delete" action for an entry in the call log.  The delete
-         action triggers the removal of the current call log entry from the call log.
-         Note: AccessibilityServices uses this attribute to announce the purpose of the button.
-         [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>
-
     <!-- String describing the "details" action for an entry in the call log.  The details action
          displays the call details screen for an entry in the call log.  This shows the calls to
          and from the specified number associated with the call log entry.