From 4de59fb9ceac10ed429cd8416251329aa03ad266 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Thu, 13 Aug 2015 15:20:08 -0700
Subject: Rename "Recents" to "Call History".

+ All user-facing indications should now say "Call History".
+ I renamed many references in code to "Call Log", which is how
we internally refer to many of the components related to call
history. It seemed excessive to rename the fragment, list items,
adapters, and other references to that throughout our codebase.

Bug: 23017190
Change-Id: I99719122ce592962ff99705dcf4b16e17eee3ab7
---
 res/drawable/tab_history.xml             | 30 ++++++++++++++++++++++
 res/drawable/tab_recents.xml             | 30 ----------------------
 res/layout/voicemail_playback_layout.xml |  2 +-
 res/menu/call_details_options.xml        |  6 ++---
 res/menu/call_log_options.xml            |  2 +-
 res/values/strings.xml                   | 43 ++++++++++++--------------------
 6 files changed, 51 insertions(+), 62 deletions(-)
 create mode 100644 res/drawable/tab_history.xml
 delete mode 100644 res/drawable/tab_recents.xml

(limited to 'res')

diff --git a/res/drawable/tab_history.xml b/res/drawable/tab_history.xml
new file mode 100644
index 000000000..b1a531840
--- /dev/null
+++ b/res/drawable/tab_history.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2014 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
+  -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/tab_ripple_color">
+
+    <item>
+        <bitmap android:src="@drawable/ic_schedule_24dp"
+            android:gravity="center" />
+    </item>
+
+    <item android:id="@android:id/mask">
+        <color android:color="@android:color/white" />
+    </item>
+
+</ripple>
diff --git a/res/drawable/tab_recents.xml b/res/drawable/tab_recents.xml
deleted file mode 100644
index b1a531840..000000000
--- a/res/drawable/tab_recents.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 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
-  -->
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/tab_ripple_color">
-
-    <item>
-        <bitmap android:src="@drawable/ic_schedule_24dp"
-            android:gravity="center" />
-    </item>
-
-    <item android:id="@android:id/mask">
-        <color android:color="@android:color/white" />
-    </item>
-
-</ripple>
diff --git a/res/layout/voicemail_playback_layout.xml b/res/layout/voicemail_playback_layout.xml
index 56865fcd6..555d20142 100644
--- a/res/layout/voicemail_playback_layout.xml
+++ b/res/layout/voicemail_playback_layout.xml
@@ -94,7 +94,7 @@
                     style="@style/VoicemailPlaybackLayoutButtonStyle"
                     android:src="@drawable/ic_delete_24dp"
                     android:tint="@color/voicemail_icon_tint"
-                    android:contentDescription="@string/recentCalls_trashVoicemail" />
+                    android:contentDescription="@string/call_log_trash_voicemail" />
 
             </LinearLayout>
 
diff --git a/res/menu/call_details_options.xml b/res/menu/call_details_options.xml
index f08b4facd..84cc2c9eb 100644
--- a/res/menu/call_details_options.xml
+++ b/res/menu/call_details_options.xml
@@ -18,15 +18,15 @@
     <item android:id="@+id/menu_trash"
         android:icon="@drawable/ic_delete_24dp"
         android:showAsAction="ifRoom"
-        android:title="@string/recentCalls_trashVoicemail" />
+        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/recentCalls_removeFromRecentList" />
+        android:title="@string/call_log_remove_from_call_log" />
 
     <item android:id="@+id/menu_edit_number_before_call"
-        android:title="@string/recentCalls_editNumberBeforeCall" />
+        android:title="@string/call_log_edit_number_before_call" />
 
     <item android:id="@+id/menu_report"
         android:title="@string/call_detail_menu_report" />
diff --git a/res/menu/call_log_options.xml b/res/menu/call_log_options.xml
index 50b1cad5b..da38d864d 100644
--- a/res/menu/call_log_options.xml
+++ b/res/menu/call_log_options.xml
@@ -16,7 +16,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/delete_all"
-        android:title="@string/recentCalls_deleteAll"
+        android:title="@string/call_log_delete_all"
         android:showAsAction="never"
         android:orderInCategory="1"/>
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8eeb03c4a..a80153c29 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -40,12 +40,7 @@
     This is especially valuable for views without textual representation like ImageView.
 
     [CHAR LIMIT=NONE] -->
-    <string name="recentCallsIconLabel">Call history</string>
-
-    <!-- Menu item used to call a contact from the call log -->
-    <string name="recentCalls_callNumber">Call
-        <xliff:g id="name">%s</xliff:g>
-    </string>
+    <string name="callHistoryIconLabel">Call history</string>
 
     <!-- Text for a menu item to report a call as having been incorrectly identified.
          [CHAR LIMIT=30] -->
@@ -58,28 +53,16 @@
     <string name="copy_transcript_text">Copy transcription to clipboard</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="recentCalls_editNumberBeforeCall">Edit number before call</string>
-
-    <!-- Menu item used to add a number from the call log to contacts -->
-    <string name="recentCalls_addToContact">Add to a contact</string>
+    <string name="call_log_edit_number_before_call">Edit number before call</string>
 
     <!-- Menu item used to remove a single call from the call log -->
-    <string name="recentCalls_removeFromRecentList">Delete from call history</string>
+    <string name="call_log_remove_from_call_log">Delete from call history</string>
 
     <!-- Menu item used to remove all calls from the call log -->
-    <string name="recentCalls_deleteAll">Clear call history</string>
+    <string name="call_log_delete_all">Clear call history</string>
 
     <!-- Menu item used to delete a voicemail. [CHAR LIMIT=30] -->
-    <string name="recentCalls_trashVoicemail">Delete voicemail</string>
-
-    <!-- Menu item used to share a voicemail. [CHAR LIMIT=30] -->
-    <string name="recentCalls_shareVoicemail">Share voicemail</string>
-
-    <!-- Text displayed when the call log is empty. -->
-    <string name="recentCalls_empty">Your call log is empty</string>
-
-    <!-- Label of the button displayed when the call log is empty. Allows the user to make a call. -->
-    <string name="recentCalls_empty_action">Make a call</string>
+    <string name="call_log_trash_voicemail">Delete voicemail</string>
 
     <!-- Title of the confirmation dialog for clearing the call log. [CHAR LIMIT=37]  -->
     <string name="clearCallLogConfirmation_title">Clear call history?</string>
@@ -474,17 +457,23 @@
          Do not translate. -->
     <string name="view_full_call_history_font_family">sans-serif</string>
 
+    <!-- Text displayed when the call log is empty. -->
+    <string name="call_log_all_empty">Your call history is empty</string>
+
+    <!-- Label of the button displayed when the call history is empty. Allows the user to make a call. -->
+    <string name="call_log_all_empty_action">Make a call</string>
+
     <!-- Text displayed when the list of missed calls is empty -->
-    <string name="recentMissed_empty">You have no missed calls.</string>
+    <string name="call_log_missed_empty">You have no missed calls.</string>
 
     <!-- Text displayed when the list of voicemails is empty -->
-    <string name="recentVoicemails_empty">Your voicemail inbox is empty.</string>
+    <string name="call_log_voicemail_empty">Your voicemail inbox is empty.</string>
 
     <!--  Menu option to show favorite contacts only -->
     <string name="show_favorites_only">Show favorites only</string>
 
     <!--  Title of activity that displays a list of all calls -->
-    <string name="call_log_activity_title">History</string>
+    <string name="call_log_activity_title">Call History</string>
 
     <!-- Title for the call log tab containing the list of all voicemails and calls
          [CHAR LIMIT=30] -->
@@ -502,8 +491,8 @@
          [CHAR LIMIT=40] -->
     <string name="tab_speed_dial">Speed dial</string>
 
-    <!-- Accessibility text for the tab showing the call log of recent calls. [CHAR LIMIT=40] -->
-    <string name="tab_recents">Recents</string>
+    <!-- Accessibility text for the tab showing the call history. [CHAR LIMIT=40] -->
+    <string name="tab_history">Call History</string>
 
     <!-- Accessibility text for the tab showing the user's contacts. [CHAR LIMIT=40] -->
     <string name="tab_all_contacts">Contacts</string>
-- 
cgit v1.2.3