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

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

Browse Source 
am: 2339b786c7

* commit '2339b786c77fb75f2f123f592195579da20554ca':
  Changing string in notification when data is blocked. b/25209821
  Changing string in notification when data is blocked. b/25209821
This commit is contained in:
Pankaj Kanwar
2016-02-23 21:40:52 +00:00
committed by android-build-merger
parent 86ee2c0235 2339b786c7
commit 934b91db10
2 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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. -->

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

@@ -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" />