diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-02 20:55:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-02 20:55:40 +0000 |
| commit | 9ebcbef57c9c694f2ab1c357b6b6356d0aa0d143 (patch) | |
| tree | e4837461424afd18be9fd6170c3a0c581bd52cc7 /java | |
| parent | eceebff226c0df860bc44f3c6f524784839462c5 (diff) | |
| parent | 03d812872a71ee4817c6ae9ff03430c8d974026a (diff) | |
Merge "Renamed call_details string, which was conflicting with one from the calldetails package."
Diffstat (limited to 'java')
| -rw-r--r-- | java/com/android/dialer/calllog/ui/menu/Modules.java | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/calllog/ui/menu/res/values/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
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 |