diff options
| author | Wink Saville <wink@google.com> | 2014-01-08 11:31:02 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-08 11:31:02 -0800 |
| commit | 2626d0e18dc9898d70f75540fabc67421f33fab3 (patch) | |
| tree | f477ef3d3c51e2787122eb91ae43a0883cad255a /core/res | |
| parent | 12ec2e6d71bc69ca11946f7f051931863c934273 (diff) | |
| parent | ad06883730b4cd4af98c0c3ec69a7e851f9cace9 (diff) | |
| download | frameworks_base-2626d0e18dc9898d70f75540fabc67421f33fab3.zip frameworks_base-2626d0e18dc9898d70f75540fabc67421f33fab3.tar.gz frameworks_base-2626d0e18dc9898d70f75540fabc67421f33fab3.tar.bz2 | |
am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit 'ad06883730b4cd4af98c0c3ec69a7e851f9cace9':
telephony: Add same named operator configuration for some operators
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values-mcc404/config.xml (renamed from core/res/res/values-mcc404-mnc85/config.xml) | 3 | ||||
| -rw-r--r-- | core/res/res/values-mcc405/config.xml | 26 | ||||
| -rw-r--r-- | core/res/res/values-mcc520/config.xml (renamed from core/res/res/values-mcc404-mnc17/config.xml) | 2 |
3 files changed, 29 insertions, 2 deletions
diff --git a/core/res/res/values-mcc404-mnc85/config.xml b/core/res/res/values-mcc404/config.xml index fd780ab..a106b0a 100644 --- a/core/res/res/values-mcc404-mnc85/config.xml +++ b/core/res/res/values-mcc404/config.xml @@ -20,6 +20,7 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Show roaming icon though same named operators. --> <string-array translatable="false" name="config_sameNamedOperatorConsideredRoaming"> - <item>40483</item> + <item>404</item> + <item>405</item> </string-array> </resources> diff --git a/core/res/res/values-mcc405/config.xml b/core/res/res/values-mcc405/config.xml new file mode 100644 index 0000000..a106b0a --- /dev/null +++ b/core/res/res/values-mcc405/config.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2013, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Show roaming icon though same named operators. --> + <string-array translatable="false" name="config_sameNamedOperatorConsideredRoaming"> + <item>404</item> + <item>405</item> + </string-array> +</resources> diff --git a/core/res/res/values-mcc404-mnc17/config.xml b/core/res/res/values-mcc520/config.xml index 685d012..b2f3efa 100644 --- a/core/res/res/values-mcc404-mnc17/config.xml +++ b/core/res/res/values-mcc520/config.xml @@ -20,6 +20,6 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Show roaming icon though same named operators. --> <string-array translatable="false" name="config_sameNamedOperatorConsideredRoaming"> - <item>40491</item> + <item>520</item> </string-array> </resources> |