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

Commit cb489988 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge \"Add conference call label.\" into nyc-mr1-dev 

am: 9e0450a4

Change-Id: I360791bda03611f55cdd31aa899465644e9901ef
parents 4ffaa760 9e0450a4

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -4396,4 +4396,6 @@ 
    <!-- Accessibilty string added to a widget that has been suspended [CHAR LIMIT=20] -->

    <string name="suspended_widget_accessibility">Disabled <xliff:g id="label" example="Calendar">%1$s</xliff:g></string>



    <!-- Label used by Telephony code, assigned as the display name for conference calls [CHAR LIMIT=60] -->

    <string name="conference_call">Conference Call</string>

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1107,6 +1107,7 @@ 
  <java-symbol type="string" name="config_demoModeLauncherComponent" />

  <java-symbol type="string" name="demo_starting_message" />

  <java-symbol type="string" name="demo_restarting_message" />

  <java-symbol type="string" name="conference_call" />





  <java-symbol type="plurals" name="bugreport_countdown" />