From 03d812872a71ee4817c6ae9ff03430c8d974026a Mon Sep 17 00:00:00 2001
From: zachh <zachh@google.com>
Date: Tue, 31 Oct 2017 13:37:52 -0700
Subject: Renamed call_details string, which was conflicting with one from the
 calldetails package.

Test: tap
PiperOrigin-RevId: 174084052
Change-Id: I10c07767392060fafed048a74df5aece4090cd68
---
 java/com/android/dialer/calllog/ui/menu/Modules.java           | 2 +-
 java/com/android/dialer/calllog/ui/menu/res/values/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'java/com/android/dialer/calllog')

diff --git a/java/com/android/dialer/calllog/ui/menu/Modules.java b/java/com/android/dialer/calllog/ui/menu/Modules.java
index 8de63518c..550e28453 100644
--- a/java/com/android/dialer/calllog/ui/menu/Modules.java
+++ b/java/com/android/dialer/calllog/ui/menu/Modules.java
@@ -198,7 +198,7 @@ final class Modules {
                 dialerContact,
                 canReportInaccurateNumber,
                 canSupportAssistedDialing),
-            R.string.call_details,
+            R.string.call_details_menu_label,
             R.drawable.quantum_ic_info_outline_vd_theme_24));
   }
 
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values/strings.xml
index aaa7da04a..cea1f3877 100644
--- a/java/com/android/dialer/calllog/ui/menu/res/values/strings.xml
+++ b/java/com/android/dialer/calllog/ui/menu/res/values/strings.xml
@@ -30,6 +30,6 @@
 
   <!-- Option shown in call log menu to navigate the user to the call details screen where the user
        can view details for the call log entry. [CHAR LIMIT=30] -->
-  <string name="call_details">Call details</string>
+  <string name="call_details_menu_label">Call details</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3