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

Commit dae07444 authored by Etan Cohen's avatar Etan Cohen Committed by Android Git Automerger
Browse files

am 20cde281: am 053bc0c9: Add configuration flag controlling whether IMS can... 

am 20cde281: am 053bc0c9: Add configuration flag controlling whether IMS can be completely disabled.

* commit '20cde2816718a25a378e4ad0bbe736290d85ca25':
  Add configuration flag controlling whether IMS can be completely disabled.
parents 8cb829da 452021f0

core/res/res/values-mcc311-mnc480

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
./values-mcc310-mnc004
 
 No newline at end of file

core/res/res/values-mcc311-mnc480/config.xml

0 → 100644
+41 −0
Original line number Diff line number Diff line 
<?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>

core/res/res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -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" />

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />