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/incallui/res/values | |
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/incallui/res/values')
-rw-r--r-- | java/com/android/incallui/res/values/strings.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/java/com/android/incallui/res/values/strings.xml b/java/com/android/incallui/res/values/strings.xml index 15cd2e02d..c7e5677c7 100644 --- a/java/com/android/incallui/res/values/strings.xml +++ b/java/com/android/incallui/res/values/strings.xml @@ -202,4 +202,19 @@ <!-- Text for bubble return-to-call button --> <string name="bubble_return_to_call">Back to call</string> + <!-- Title for RTT request dialog. [CHAR LIMIT=60] --> + <string name="rtt_request_dialog_title">Join RTT call?</string> + + <!-- Details for RTT request dialog. [CHAR LIMIT=NONE] --> + <string name="rtt_request_dialog_details"><xliff:g id="caller">%1$s</xliff:g> wants to use messaging within your voice call.</string> + + <!-- More information for RTT request dialog. [CHAR LIMIT=NONE] --> + <string name="rtt_request_dialog_more_information">RTT assists callers who are deaf, hard of hearing, have a speech disability, or need more than voice alone.</string> + + <!-- Text for button to decline RTT request. [CHAR LIMIT=20] --> + <string name="rtt_button_decline_request">No thanks</string> + + <!-- Text for button to accept RTT request. [CHAR LIMIT=20] --> + <string name="rtt_button_accept_request">Join RTT</string> + </resources> |