diff options
| author | Eric Erfanian <erfanian@google.com> | 2018-05-01 13:46:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-01 13:46:37 +0000 |
| commit | cccd332af6185505101df03ebee11923d7ee5fd4 (patch) | |
| tree | b70c83971f5281b4afc9e2d0534da21c8d5fbc6a /java/com/android/dialer/precall/impl/res | |
| parent | eac73f3067acefffaa8eec7b7a9d8b3cc176e674 (diff) | |
| parent | 2e36647b63e859c299d8242736226c00071836d9 (diff) | |
Merge changes If140d716,I89a186fa,Iee4e5c09,I5df97f0c,I55f75dc3, ...
* changes:
Don't start emergency call in background calling mode.
Make call configuration package visibility public.
Don't save transcript if it's empty.
Cancel all legacy voicemail notification when SIMs are removed on multi-SIM devices
Fix bug that transcript button is visible for voice call.
Refactor PreferredAccountWorker to provide the dialog to be shown.
Fix bug that displaying local message is not in sync.
Don't show dialog if in call activity is not visible.
Bubble changes for background calling.
Store RTT transcript message received when UI is in background.
Update RTT transcript advisory text.
Implement "Add to favorites" option in suggestions menu.
Diffstat (limited to 'java/com/android/dialer/precall/impl/res')
| -rw-r--r-- | java/com/android/dialer/precall/impl/res/values/strings.xml | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/java/com/android/dialer/precall/impl/res/values/strings.xml b/java/com/android/dialer/precall/impl/res/values/strings.xml index 5e7ddd36c..a920f0720 100644 --- a/java/com/android/dialer/precall/impl/res/values/strings.xml +++ b/java/com/android/dialer/precall/impl/res/values/strings.xml @@ -17,17 +17,4 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Toast when the user tried to place a call but has revoked phone permission [CHAR_LIMIT=none] --> <string name="pre_call_permission_check_no_phone_permission">Cannot make call without phone permission</string> - - <!-- Title of the dialog to select which SIM to call with before making a call, if the device has - multiple SIMs [CHAR LIMIT=40]--> - <string name="pre_call_select_phone_account">Choose SIM for this call</string> - - <!-- Checkbox label when selecting a SIM when calling a contact, to use the selected SIM for the - same contact and never ask again [CHAR LIMIT=40]--> - <string name="pre_call_select_phone_account_remember">Remember this choice</string> - - <!-- Hint to show under a SIM entry when selecting SIM for call on a multi-SIM device, when the - call cannot be placed with the SIM because there is already a call on the other SIM, - [CHAR LIMIT=NONE]--> - <string name="pre_call_select_phone_account_hint_other_sim_in_use">Not available while using <xliff:g example="SIM 1" id="other_sim">%1$s</xliff:g></string> </resources>
\ No newline at end of file |