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

am c7ffe5e2: Merge "TTY over IMS: Add messages about change of TTY mode in the repote device" into lmp-mr1-dev

Browse Source 
automerge: 0208d3c

* commit '0208d3c8236af7c72d47c9c04ae1a79d0343559d':
  TTY over IMS: Add messages about change of TTY mode in the repote device
This commit is contained in:
Pavel Zhamaitsiak
2014-11-20 21:14:39 +00:00
committed by android-build-merger
parent a2b3a75ca5 0208d3c823
commit 950daf58af
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -204,6 +204,12 @@
<!-- Displayed to tell the user that all service is blocked by access control. -->
<string name="RestrictedOnAll">All voice/data/SMS services are blocked.</string>
<!-- Displayed to tell the user that peer changed TTY mode -->
<string name="peerTtyModeFull">Peer requested TTY Mode FULL</string>
<string name="peerTtyModeHco">Peer requested TTY Mode HCO</string>
<string name="peerTtyModeVco">Peer requested TTY Mode VCO</string>
<string name="peerTtyModeOff">Peer requested TTY Mode OFF</string>
<!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings--> <skip />
<!-- Example: Service was enabled for: Voice, Data -->
<string name="serviceClassVoice">Voice</string>

4
core/res/res/values/symbols.xml
View File

@@ -715,6 +715,10 @@
<java-symbol type="string" name="perms_description_app" />
<java-symbol type="string" name="perms_new_perm_prefix" />
<java-symbol type="string" name="petabyteShort" />
<java-symbol type="string" name="peerTtyModeFull" />
<java-symbol type="string" name="peerTtyModeHco" />
<java-symbol type="string" name="peerTtyModeVco" />
<java-symbol type="string" name="peerTtyModeOff" />
<java-symbol type="string" name="phoneTypeAssistant" />
<java-symbol type="string" name="phoneTypeCallback" />
<java-symbol type="string" name="phoneTypeCar" />