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

Commit 58ccf0e4 authored by Richard Uhler's avatar Richard Uhler
Browse files

resolve merge conflicts of 617d3823 to pi-dev-plus-aosp 

Test: None
Bug: 113942223
Change-Id: I0ce0db080c355b259b6140cc67772b8400e46b82
Merged-In: I1b65a8bee81f1d190c587cf65cb55da64a184284
parents 66bd4510 617d3823

core/res/res/values-mcc208-mnc01/config.xml

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2009, 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.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds.  Do not translate. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- String containing the apn value for tethering.  May be overriden by secure settings

         TETHER_DUN_APN.  Value is a comma separated series of strings:

         "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",

         Or string format of ApnSettingV3.

         note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->

    <string-array translatable="false" name="config_tether_apndata">

        <item>Orange Internet,orange.fr,,,orange,orange,,,,,208,01,1,DUN</item>

    </string-array>



</resources>

core/res/res/values-mcc208-mnc10/config.xml

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2009, 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 my 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.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- String containing the apn value for tethering.  May be overriden by secure settings

         TETHER_DUN_APN.  Value is a comma separated series of strings:

         "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",

         Or string format of ApnSettingV3.

         note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->

    <string-array translatable="false" name="config_tether_apndata">

        <item>SFR option modem,websfr,,,,,,,,,208,10,,DUN</item>

        <item>[ApnSettingV3]INTERNET NRJ,internetnrj,,,,,,,,,208,10,,DUN,,,true,0,,,,,,,gid,4E</item>

    </string-array>



</resources>

core/res/res/values-mcc214-mnc01/config.xml

+0 −9
Original line number Diff line number Diff line
@@ -31,15 +31,6 @@ 
      <item>9</item>

    </integer-array>



    <!-- String containing the apn value for tethering.  May be overriden by secure settings

         TETHER_DUN_APN.  Value is a comma separated series of strings:

         "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",

         Or string format of ApnSettingV3.

         note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->

    <string-array translatable="false" name="config_tether_apndata">

      <item>INTERNET,airtelnet.es,,,vodafone,vodafone,,,,,214,01,1,DUN</item>

    </string-array>



    <!-- Whether safe headphone volume warning dialog is disabled on Vol+ (operator specific). -->

    <bool name="config_safe_media_disable_on_volume_up">false</bool>

core/res/res/values-mcc214-mnc07/config.xml

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
<?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 my 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.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- String containing the apn value for tethering.  May be overriden by secure settings

         TETHER_DUN_APN.  Value is a comma separated series of strings:

         "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",

         Or string format of ApnSettingV3.

         note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->

    <string-array translatable="false" name="config_tether_apndata">

        <item>Conexión Compartida,movistar.es,,,MOVISTAR,MOVISTAR,,,,,214,07,1,DUN</item>

    </string-array>



</resources>

core/res/res/values-mcc222-mnc10/config.xml

+0 −9
Original line number Diff line number Diff line
@@ -20,15 +20,6 @@ 
<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds.  Do not translate. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- String containing the apn value for tethering.  May be overriden by secure settings

         TETHER_DUN_APN.  Value is a comma separated series of strings:

         "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",

         Or string format of ApnSettingV3.

         note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->

    <string-array translatable="false" name="config_tether_apndata">

      <item>Tethering Internet,web.omnitel.it,,,,,,,,,222,10,,DUN</item>

    </string-array>



    <!-- Whether safe headphone volume warning dialog is disabled on Vol+ (operator specific). -->

    <bool name="config_safe_media_disable_on_volume_up">false</bool>