Revert "Workaround for AOSP strings missing translations"

This reverts commit b025fbb9b46a19e8622867317ce7ae482f0dde1b.

Change-Id: I66f504e268700e4a14768b11d3952b77c06706a1

4 files changed, 3 insertions, 6 deletions

diff --git a/res/layout/show_call_history_list_item.xml b/res/layout/show_call_history_list_item.xml
index 8a071d00a..1264894a9 100644
--- a/res/layout/show_call_history_list_item.xml
+++ b/res/layout/show_call_history_list_item.xml
@@ -24,7 +24,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:text="@string/recents_footer_text" />
+        android:text="@string/show_call_history" />
 
 </android.support.v7.widget.CardView>
 
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 68d732fda..46d363734 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -170,9 +170,6 @@
     <!-- Shown as a prompt to turn on the phone permission to allow a call to be placed -->
     <string name="cm_permission_place_call">To place a call, turn on Phone permissions.</string>
 
-    <!-- Label of the button displayed when the call log is empty. Allows the user to make a call. -->
-    <string name="recentCalls_empty_action_cm">Make a call</string>
-
     <!-- Label of the button to view a note from a call log entry with associated DeepLink -->
     <string name="search_shortcut_view_note">View note</string>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 463f73eb5..c45ea3776 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -530,7 +530,7 @@
     <string name="search_shortcut_make_video_call">Make video call</string>
 
     <!-- Title for the call log list item that brings users to the full call history when clicked -->
-    <string name="recents_footer_text">View full call history</string>
+    <string name="show_call_history">View full call history</string>
 
     <!-- Number of missed calls shown on call card [CHAR LIMIT=40] -->
     <string name="num_missed_calls"><xliff:g id="number">%s</xliff:g> new missed calls</string>
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index b6140c702..1f223b970 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -469,7 +469,7 @@ public class CallLogFragment extends Fragment implements CallLogQueryHandler.Lis
         }
         mEmptyListView.setDescription(messageId);
         if (mIsRecentsFragment) {
-            mEmptyListView.setActionLabel(R.string.recentCalls_empty_action_cm);
+            mEmptyListView.setActionLabel(R.string.recentCalls_empty_action);
         } else {
             mEmptyListView.setActionLabel(EmptyContentView.NO_LABEL);
         }