diff options
author | Etan Cohen <etancohen@google.com> | 2014-08-08 15:44:23 -0700 |
---|---|---|
committer | Etan Cohen <etancohen@google.com> | 2014-08-11 08:41:19 -0700 |
commit | 1584609f422c338ade65b8b4078b434ba3a81253 (patch) | |
tree | 3c28da76ec16262f5822f2f996f3e18f3da2200d | |
parent | 362dac08e4265372ba3b1506eb273aa7ae9e9f0f (diff) | |
download | frameworks_base-1584609f422c338ade65b8b4078b434ba3a81253.zip frameworks_base-1584609f422c338ade65b8b4078b434ba3a81253.tar.gz frameworks_base-1584609f422c338ade65b8b4078b434ba3a81253.tar.bz2 |
Add configuration flag controlling whether IMS can be completely disabled.
Change-Id: I70e6fc163d65bba7d1260df0acb74ca614e54b68
l--------- | core/res/res/values-mcc311-mnc480 | 1 | ||||
-rw-r--r-- | core/res/res/values-mcc311-mnc480/config.xml | 41 | ||||
-rw-r--r-- | core/res/res/values/config.xml | 5 | ||||
-rw-r--r-- | core/res/res/values/symbols.xml | 1 |
4 files changed, 47 insertions, 1 deletions
diff --git a/core/res/res/values-mcc311-mnc480 b/core/res/res/values-mcc311-mnc480 deleted file mode 120000 index 96b1be9..0000000 --- a/core/res/res/values-mcc311-mnc480 +++ /dev/null @@ -1 +0,0 @@ -./values-mcc310-mnc004
\ No newline at end of file diff --git a/core/res/res/values-mcc311-mnc480/config.xml b/core/res/res/values-mcc311-mnc480/config.xml new file mode 100644 index 0000000..e3d8420 --- /dev/null +++ b/core/res/res/values-mcc311-mnc480/config.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2012, 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"> + + <!-- CDMA home system id for Verizon --> + <string-array translatable="false" name="config_cdma_home_system"> + <item>64</item> + <item>65</item> + <item>76</item> + <item>77</item> + <item>78</item> + <item>79</item> + <item>80</item> + <item>81</item> + <item>82</item> + <item>83</item> + </string-array> + + <!-- Flag indicating whether the IMS service can be turned off. If false then + the service will not be turned-off completely (the ImsManager.turnOffIms() will + be disabled) but individual Features can be disabled using ImsConfig.setFeatureValue() --> + <bool name="imsServiceAllowTurnOff">false</bool> + +</resources> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index b9e5c66..169e515 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1650,6 +1650,11 @@ the IMS connection --> <bool name="useImsAlwaysForEmergencyCall">true</bool> + <!-- Flag indicating whether the IMS service can be turned off. If false then + the service will not be turned-off completely (the ImsManager.turnOffIms() will + be disabled) but individual Features can be disabled using ImsConfig.setFeatureValue() --> + <bool name="imsServiceAllowTurnOff">true</bool> + <bool name="config_networkSamplingWakesDevice">true</bool> <string-array translatable="false" name="config_cdma_home_system" /> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 250711e..78e237f 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1956,6 +1956,7 @@ <java-symbol type="style" name="Theme.DeviceDefault.Resolver" /> <java-symbol type="attr" name="preferenceFragmentStyle" /> <java-symbol type="bool" name="skipHoldBeforeMerge" /> + <java-symbol type="bool" name="imsServiceAllowTurnOff" /> <java-symbol type="bool" name="useImsAlwaysForEmergencyCall" /> <java-symbol type="attr" name="touchscreenBlocksFocus" /> <java-symbol type="layout" name="resolver_list_with_default" /> |