Merge "Revert "TeleService: Add new Network mode menu list for CMCC""
This commit is contained in:
commit
cd1e0f6f79
|
@ -1,45 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--Copyright (c) 2015, The Linux Foundation. All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
met:
|
||||
* Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
* Redistributions in binary form must reproduce the above
|
||||
copyright notice, this list of conditions and the following
|
||||
disclaimer in the documentation and/or other materials provided
|
||||
with the distribution.
|
||||
* Neither the name of The Linux Foundation nor the names of its
|
||||
contributors may be used to endorse or promote products derived
|
||||
from this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
|
||||
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
|
||||
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
|
||||
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
||||
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
|
||||
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
-->
|
||||
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string-array name="preferred_network_mode_choices">
|
||||
<item>@string/preferred_network_mode_4g_3g_2g_auto</item>
|
||||
<item>@string/preferred_network_mode_3g_2g_auto</item>
|
||||
</string-array>
|
||||
<string-array name="preferred_network_mode_values" translatable="false">
|
||||
<item>"20"</item>
|
||||
<item>"18"</item>
|
||||
</string-array>
|
||||
<string name="preferred_network_mode_td_scdma_gsm_wcdma_summary">
|
||||
@string/preferred_network_mode_3g_2g_auto</string>
|
||||
<string name="preferred_network_mode_td_scdma_gsm_wcdma_lte_summary">
|
||||
@string/preferred_network_mode_4g_3g_2g_auto</string>
|
||||
<string name="preferred_network_mode_dialogtitle">
|
||||
@string/preferred_network_mode_dialogtitle_show_radio_tech</string>
|
||||
</resources>
|
|
@ -1,45 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--Copyright (c) 2015, The Linux Foundation. All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
met:
|
||||
* Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
* Redistributions in binary form must reproduce the above
|
||||
copyright notice, this list of conditions and the following
|
||||
disclaimer in the documentation and/or other materials provided
|
||||
with the distribution.
|
||||
* Neither the name of The Linux Foundation nor the names of its
|
||||
contributors may be used to endorse or promote products derived
|
||||
from this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
|
||||
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
|
||||
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
|
||||
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
||||
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
|
||||
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
-->
|
||||
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string-array name="preferred_network_mode_choices">
|
||||
<item>@string/preferred_network_mode_4g_3g_2g_auto</item>
|
||||
<item>@string/preferred_network_mode_3g_2g_auto</item>
|
||||
</string-array>
|
||||
<string-array name="preferred_network_mode_values" translatable="false">
|
||||
<item>"20"</item>
|
||||
<item>"18"</item>
|
||||
</string-array>
|
||||
<string name="preferred_network_mode_td_scdma_gsm_wcdma_summary">
|
||||
@string/preferred_network_mode_3g_2g_auto</string>
|
||||
<string name="preferred_network_mode_td_scdma_gsm_wcdma_lte_summary">
|
||||
@string/preferred_network_mode_4g_3g_2g_auto</string>
|
||||
<string name="preferred_network_mode_dialogtitle">
|
||||
@string/preferred_network_mode_dialogtitle_show_radio_tech</string>
|
||||
</resources>
|
|
@ -1,45 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--Copyright (c) 2015, The Linux Foundation. All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
met:
|
||||
* Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
* Redistributions in binary form must reproduce the above
|
||||
copyright notice, this list of conditions and the following
|
||||
disclaimer in the documentation and/or other materials provided
|
||||
with the distribution.
|
||||
* Neither the name of The Linux Foundation nor the names of its
|
||||
contributors may be used to endorse or promote products derived
|
||||
from this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
|
||||
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
|
||||
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
|
||||
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
||||
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
|
||||
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
-->
|
||||
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string-array name="preferred_network_mode_choices">
|
||||
<item>@string/preferred_network_mode_4g_3g_2g_auto</item>
|
||||
<item>@string/preferred_network_mode_3g_2g_auto</item>
|
||||
</string-array>
|
||||
<string-array name="preferred_network_mode_values" translatable="false">
|
||||
<item>"20"</item>
|
||||
<item>"18"</item>
|
||||
</string-array>
|
||||
<string name="preferred_network_mode_td_scdma_gsm_wcdma_summary">
|
||||
@string/preferred_network_mode_3g_2g_auto</string>
|
||||
<string name="preferred_network_mode_td_scdma_gsm_wcdma_lte_summary">
|
||||
@string/preferred_network_mode_4g_3g_2g_auto</string>
|
||||
<string name="preferred_network_mode_dialogtitle">
|
||||
@string/preferred_network_mode_dialogtitle_show_radio_tech</string>
|
||||
</resources>
|
|
@ -1,45 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--Copyright (c) 2015, The Linux Foundation. All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
met:
|
||||
* Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
* Redistributions in binary form must reproduce the above
|
||||
copyright notice, this list of conditions and the following
|
||||
disclaimer in the documentation and/or other materials provided
|
||||
with the distribution.
|
||||
* Neither the name of The Linux Foundation nor the names of its
|
||||
contributors may be used to endorse or promote products derived
|
||||
from this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
|
||||
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
|
||||
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
|
||||
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
||||
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
|
||||
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
-->
|
||||
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string-array name="preferred_network_mode_choices">
|
||||
<item>@string/preferred_network_mode_4g_3g_2g_auto</item>
|
||||
<item>@string/preferred_network_mode_3g_2g_auto</item>
|
||||
</string-array>
|
||||
<string-array name="preferred_network_mode_values" translatable="false">
|
||||
<item>"20"</item>
|
||||
<item>"18"</item>
|
||||
</string-array>
|
||||
<string name="preferred_network_mode_td_scdma_gsm_wcdma_summary">
|
||||
@string/preferred_network_mode_3g_2g_auto</string>
|
||||
<string name="preferred_network_mode_td_scdma_gsm_wcdma_lte_summary">
|
||||
@string/preferred_network_mode_4g_3g_2g_auto</string>
|
||||
<string name="preferred_network_mode_dialogtitle">
|
||||
@string/preferred_network_mode_dialogtitle_show_radio_tech</string>
|
||||
</resources>
|
|
@ -63,7 +63,4 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
<string name="preferred_network_mode_wcdma_only_choice">"仅 WCDMA"</string>
|
||||
<string name="preferred_network_mode_gsm_only_choice">"仅 GSM"</string>
|
||||
<string name="preferred_network_mode_gsm_wcdma_preferred_choice">"首选 GSM/WCDMA"</string>
|
||||
<string name="preferred_network_mode_4g_3g_2g_auto">"4G/3G/2G (自动选择)"</string>
|
||||
<string name="preferred_network_mode_3g_2g_auto">"3G/2G (自动选择)"</string>
|
||||
<string name="preferred_network_mode_dialogtitle_show_radio_tech">"网络模式"</string>
|
||||
</resources>
|
||||
|
|
|
@ -101,7 +101,4 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
<string name="preferred_network_mode_wcdma_only_choice">WCDMA only</string>
|
||||
<string name="preferred_network_mode_gsm_only_choice">GSM only</string>
|
||||
<string name="preferred_network_mode_gsm_wcdma_preferred_choice">GSM/WCDMA preferred</string>
|
||||
<string name="preferred_network_mode_4g_3g_2g_auto">"4G/3G/2G (auto)"</string>
|
||||
<string name="preferred_network_mode_3g_2g_auto">"3G/2G (auto)"</string>
|
||||
<string name="preferred_network_mode_dialogtitle_show_radio_tech">Network mode</string>
|
||||
</resources>
|
||||
|
|
Loading…
Reference in New Issue