Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 950daf58 authored by Pavel Zhamaitsiak's avatar Pavel Zhamaitsiak Committed by android-build-merger
Browse files

am c7ffe5e2: Merge "TTY over IMS: Add messages about change of TTY mode in the... 

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

* commit '0208d3c8':
  TTY over IMS: Add messages about change of TTY mode in the repote device
parents a2b3a75c 0208d3c8

core/res/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/symbols.xml

+4 −0
Original line number Diff line number Diff line
@@ -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" />