diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-04-04 01:43:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-04 01:43:18 +0000 |
| commit | d5408c9423f20bef650ca838ff66bb5ecf60f818 (patch) | |
| tree | d71a3bf4606c11bcf0ce9f2dc2266b5533561c0b /java/com/android/dialer/calllogutils/res/values/strings.xml | |
| parent | c81fbd75f18621d7ce68c8df65cc468efe6ffe23 (diff) | |
| parent | 01b782754418aa17dbb867591642b49e473e92b1 (diff) | |
Merge changes I28244a72,Ic984f958,I5dc2bed7,I1be427b3,I0220a342, ...
* changes:
Remove reference to RTT system setting.
Fix the button style of RTT request dialog.
Don't deadlock in DialerDatabaseHelper.
Fix NPE for details number
Per linguists' request, increase CHAR_LIMIT of "Carrier video" from 30 to 31.
Fix permission
Handle missed calls for new call log in old peer.
Separate calls with the video feature from others when coalescing rows in the new call log.
Support placing Duo calls in the new UI's bottom sheet.
Turn off component generating step of RootComponentGenerato and @DialerCompoennt. Delete related tests.
Implement dialog for responding RTT request.
Diffstat (limited to 'java/com/android/dialer/calllogutils/res/values/strings.xml')
| -rw-r--r-- | java/com/android/dialer/calllogutils/res/values/strings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/dialer/calllogutils/res/values/strings.xml b/java/com/android/dialer/calllogutils/res/values/strings.xml index bc19ce22a..1c1f31446 100644 --- a/java/com/android/dialer/calllogutils/res/values/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values/strings.xml @@ -131,7 +131,7 @@ <!-- String to be displayed to indicate in the call log that a call just now occurred. --> <string name="just_now">Just now</string> - <!-- Text to show in call log for a carrier video call. [CHAR LIMIT=30] --> + <!-- Text to show in call log for a carrier video call. [CHAR LIMIT=31] --> <string name="new_call_log_carrier_video">Carrier video</string> <!-- Text to show in call log for a duo video call. [CHAR LIMIT=30] --> @@ -145,4 +145,4 @@ <!-- String used to display calls from spam numbers in the call log. [CHAR LIMIT=30] --> <string name="new_call_log_secondary_spam">Spam</string> -</resources>
\ No newline at end of file +</resources> |