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

Commit 934b91db authored by Pankaj Kanwar's avatar Pankaj Kanwar Committed by android-build-merger
Browse files

Merge changes from topic \'notification\' into mm-wireless-dev 

am: 2339b786

* commit '2339b786':
  Changing string in notification when data is blocked. b/25209821
  Changing string in notification when data is blocked. b/25209821
parents 86ee2c02 2339b786

core/res/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -185,8 +185,6 @@ 
    <!-- Displayed to tell the user that they cannot change the caller ID setting. -->

    <string name="CLIRPermanent">You can\'t change the caller ID setting.</string>



    <!-- Notification title to tell the user that restricted state is changed by access control. -->

    <string name="RestrictedChangedTitle">Restricted access changed</string>

    <!-- Displayed to tell the user that data service is blocked by access control. -->

    <string name="RestrictedOnData">Data service is blocked.</string>

    <!-- Displayed to tell the user that emergency service is blocked by access control. -->

core/res/res/values/symbols.xml

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

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

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

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

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

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

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