Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Finalise STK call control strings" am: 249119da53 am: eef3fce35d

Browse Source 
am: 3d361c7ce9

Change-Id: Iae2eab9bfa5c8b130d46eaad4bbcbcd5d00e163e
This commit is contained in:
Jordan Liu
2018-03-22 06:57:35 +00:00
committed by android-build-merger
parent 1886efe5de 3d361c7ce9
commit f837986bcb
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/res/res/values/strings.xml
View File

@@ -4578,14 +4578,14 @@
<!-- Displayed when the USSD/SS request is modified by STK CC to a
different request. This will be displayed in a toast. -->
<string name="stk_cc_ussd_to_dial">USSD request is modified to DIAL request.</string>
<string name="stk_cc_ussd_to_ss">USSD request is modified to SS request.</string>
<string name="stk_cc_ussd_to_ussd">USSD request is modified to new USSD request.</string>
<string name="stk_cc_ussd_to_dial_video">USSD request is modified to Video DIAL request.</string>
<string name="stk_cc_ss_to_dial">SS request is modified to DIAL request.</string>
<string name="stk_cc_ss_to_dial_video">SS request is modified to Video DIAL request.</string>
<string name="stk_cc_ss_to_ussd">SS request is modified to USSD request.</string>
<string name="stk_cc_ss_to_ss">SS request is modified to new SS request.</string>
<string name="stk_cc_ussd_to_dial">USSD request changed to regular call</string>
<string name="stk_cc_ussd_to_ss">USSD request changed to SS request</string>
<string name="stk_cc_ussd_to_ussd">Changed to new USSD request</string>
<string name="stk_cc_ussd_to_dial_video">USSD request changed to video call</string>
<string name="stk_cc_ss_to_dial">SS request changed to regular call</string>
<string name="stk_cc_ss_to_dial_video">SS request changed to video call</string>
<string name="stk_cc_ss_to_ussd">SS request changed to USSD request</string>
<string name="stk_cc_ss_to_ss">Changed to new SS request</string>
<!-- Content description of the work profile icon in the notification. -->
<string name="notification_work_profile_content_description">Work profile</string>