From 4b937fc122050f014c8931e28744abe87d28311a Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Mon, 22 Jun 2020 11:56:34 +0200
Subject: Fix translation of 'contacts' tab title and main menu.

AOSP migrated those items to new strings, but those strings don't have
any translations. Just use the previous string instances instead, which
still exist and have valid translations.

Change-Id: I55d7e5a5bf630e5813d2a2c22888b906b704e3f5
---
 java/com/android/dialer/main/impl/bottomnav/BottomNavBar.java    | 2 +-
 java/com/android/dialer/main/impl/toolbar/res/menu/main_menu.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'java')

diff --git a/java/com/android/dialer/main/impl/bottomnav/BottomNavBar.java b/java/com/android/dialer/main/impl/bottomnav/BottomNavBar.java
index 80aa38b3e..798f01edf 100644
--- a/java/com/android/dialer/main/impl/bottomnav/BottomNavBar.java
+++ b/java/com/android/dialer/main/impl/bottomnav/BottomNavBar.java
@@ -71,7 +71,7 @@ public final class BottomNavBar extends LinearLayout {
 
     speedDial.setup(R.string.tab_title_speed_dial, R.drawable.quantum_ic_star_vd_theme_24);
     callLog.setup(R.string.tab_title_call_history, R.drawable.quantum_ic_access_time_vd_theme_24);
-    contacts.setup(R.string.tab_title_contacts, R.drawable.quantum_ic_people_vd_theme_24);
+    contacts.setup(R.string.tab_all_contacts, R.drawable.quantum_ic_people_vd_theme_24);
     voicemail.setup(R.string.tab_title_voicemail, R.drawable.quantum_ic_voicemail_vd_theme_24);
 
     speedDial.setOnClickListener(
diff --git a/java/com/android/dialer/main/impl/toolbar/res/menu/main_menu.xml b/java/com/android/dialer/main/impl/toolbar/res/menu/main_menu.xml
index ab25aa451..0e354cece 100644
--- a/java/com/android/dialer/main/impl/toolbar/res/menu/main_menu.xml
+++ b/java/com/android/dialer/main/impl/toolbar/res/menu/main_menu.xml
@@ -19,12 +19,12 @@
 
   <item
       android:id="@+id/menu_call_history"
-      android:title="@string/main_menu_call_history"
+      android:title="@string/action_menu_call_history_description"
       app:showAsAction="collapseActionView"/>
 
   <item
       android:id="@+id/clear_frequents"
-      android:title="@string/main_menu_clear_frequents"
+      android:title="@string/menu_clear_frequents"
       app:showAsAction="collapseActionView"
       android:visible="false"/>
 
@@ -38,4 +38,4 @@
     android:title="@string/nui_simulator_submenu_label"
     app:showAsAction="collapseActionView"
     android:visible="false"/>
-</menu>
\ No newline at end of file
+</menu>
-- 
cgit v1.2.3