diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2014-09-19 09:29:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-19 09:29:59 +0000 |
| commit | e81a195ca776d234dc30137701dccbb84116bd32 (patch) | |
| tree | 3073787957145c6d09afed4209906602290de529 | |
| parent | f1a094c9e1beabb9256eafb93e26113e71072c1a (diff) | |
| parent | 7f76d9051dc6f1a4ef16abd68aba3379063b1154 (diff) | |
| download | frameworks_base-e81a195ca776d234dc30137701dccbb84116bd32.zip frameworks_base-e81a195ca776d234dc30137701dccbb84116bd32.tar.gz frameworks_base-e81a195ca776d234dc30137701dccbb84116bd32.tar.bz2 | |
am c590aa2c: am 4b797fd9: am 7db61d63: am 010bdd3c: Merge "Fix voice mail number to modify when insert H3G Denmark sim card." into lmp-dev
* commit 'c590aa2c0e3711a6c5bc9bec54a9e8432b8c7550':
Fix voice mail number to modify when insert H3G Denmark sim card.
| -rw-r--r-- | core/res/res/values-mcc238-mnc06/config.xml | 23 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
3 files changed, 27 insertions, 0 deletions
diff --git a/core/res/res/values-mcc238-mnc06/config.xml b/core/res/res/values-mcc238-mnc06/config.xml new file mode 100644 index 0000000..afc0cc4 --- /dev/null +++ b/core/res/res/values-mcc238-mnc06/config.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2014, 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"> + <!-- SIM does not save, but the voice mail number to be changed. --> + <bool name="editable_voicemailnumber">true</bool> +</resources> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 5646175..25f2328 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1814,4 +1814,7 @@ <!-- Sprint need a 70 ms delay for 3way call --> <integer name="config_cdma_3waycall_flash_delay">0</integer> + + <!--SIM does not save, but the voice mail number to be changed. --> + <bool name="editable_voicemailnumber">false</bool> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 75fed32..8394e33 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -323,6 +323,7 @@ <java-symbol type="integer" name="config_wifi_framework_wifi_score_bad_link_speed_5" /> <java-symbol type="integer" name="config_wifi_framework_wifi_score_good_link_speed_24" /> <java-symbol type="integer" name="config_wifi_framework_wifi_score_good_link_speed_5" /> + <java-symbol type="bool" name="editable_voicemailnumber" /> <java-symbol type="bool" name="config_wifi_framework_cellular_handover_enable_user_triggered_adjustment" /> <java-symbol type="integer" name="config_wifi_framework_associated_full_scan_tx_packet_threshold" /> |