diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-08 23:25:54 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-08 23:25:54 +0000 |
commit | a6050952e7e4aba11c4c1d931498826f5a1946b0 (patch) | |
tree | 24503b9ed47858092bc4886426831497a4cf7f43 | |
parent | aef18f84f3c42fdf91da77a7c9a7ba1b7f75dfdf (diff) | |
parent | c9341c73af4b14d180ab95ac44b82bc8c0409c8a (diff) | |
download | Telephony-pie-platform-release.tar.gz |
Snap for 5622519 from c9341c73af4b14d180ab95ac44b82bc8c0409c8a to pi-platform-releasepie-platform-release
Change-Id: Icc19cf8743b1c03ffcf867db0d963724429e40e4
-rw-r--r-- | res/values-hy/strings.xml | 8 | ||||
-rw-r--r-- | res/values-iw/strings.xml | 12 | ||||
-rw-r--r-- | res/values-kk/strings.xml | 4 | ||||
-rw-r--r-- | res/values-mcc204-mnc04/strings.xml | 2 | ||||
-rw-r--r-- | res/values-mcc311-mnc220/strings.xml | 20 | ||||
-rw-r--r-- | res/values-mcc311-mnc225/strings.xml | 20 | ||||
-rw-r--r-- | res/values-mcc311-mnc580/strings.xml | 20 | ||||
-rw-r--r-- | res/values-pt/strings.xml | 6 | ||||
-rw-r--r-- | res/values/strings.xml | 4 | ||||
-rw-r--r-- | sip/res/values-be/strings.xml | 2 | ||||
-rw-r--r-- | src/com/android/phone/MobileNetworkSettings.java | 52 |
11 files changed, 130 insertions, 20 deletions
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 9c3b5ed6b..1450d2566 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -434,7 +434,7 @@ <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Ընթերցում է SIM քարտից..."</string> <string name="simContacts_empty" msgid="5270660846489561932">"Ձեր SIM քարտում կոնտակտներ չկան:"</string> <string name="simContacts_title" msgid="1861472842524839921">"Ընտրեք կոնտակտները ներմուծման համար"</string> - <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Կոնտակտները SIM քարտից ներմուծելու համար անջատեք Ինքնաթիռի ռեժիմը:"</string> + <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Կոնտակտները SIM քարտից ներմուծելու համար անջատեք Ավիառեժիմը:"</string> <string name="enable_pin" msgid="5422767284133234860">"Միացնել/անջատել SIM PIN-ը"</string> <string name="change_pin" msgid="9174186126330785343">"Փոխել SIM PIN-ը"</string> <string name="enter_pin_text" msgid="8532615714751931951">"SIM PIN՝"</string> @@ -486,8 +486,8 @@ <string name="notification_network_selection_title" msgid="4224455487793492772">"Ծառայություններ չկան"</string> <string name="notification_network_selection_text" msgid="2607085729661923269">"Ընտրված ցանցը (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) անհասանելի է"</string> <string name="incall_error_power_off" product="watch" msgid="2007450435656211658">"Զանգ կատարելու համար միացեք բջջային ցանցին, անջատեք ինքնաթիռի կամ էներգախնայման ռեժիմը:"</string> - <string name="incall_error_power_off" product="default" msgid="2947938060513306698">"Զանգ կատարելու համար անջատեք Ինքնաթիռի ռեժիմը:"</string> - <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Զանգ կատարելու համար անջատեք Ինքնաթիռի ռեժիմը կամ միացեք անլար ցանցին:"</string> + <string name="incall_error_power_off" product="default" msgid="2947938060513306698">"Զանգ կատարելու համար անջատեք Ավիառեժիմը:"</string> + <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Զանգ կատարելու համար անջատեք Ավիառեժիմը կամ միացեք անլար ցանցին:"</string> <string name="incall_error_ecm_emergency_only" msgid="738708660612388692">"Սովորական զանգ կատարելու համար դուրս եկեք շտապ կանչի ռեժիմից։"</string> <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ցանցում գրանցված չէ:"</string> <string name="incall_error_out_of_service" msgid="8587993036435080418">"Բջջային ցանցն անհասանելի է:"</string> @@ -515,7 +515,7 @@ <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Կրկին հպեք՝ <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> համարին զանգելու համար"</string> <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Ռադիոն միացվում է..."</string> <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ծառայությունը մատչելի չէ: Նորից փորձեք…"</string> - <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Շտապ կանչի ժամանակ հնարավոր չէ մտնել ինքնաթիռի ռեժիմ:"</string> + <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Շտապ կանչի ժամանակ հնարավոր չէ մտնել Ավիառեժիմ:"</string> <string name="dial_emergency_error" msgid="1509085166367420355">"Հնարավոր չէ զանգել: <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> համարը արտակարգ իրավիճակի համար չէ:"</string> <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Հնարավոր չէ զանգել: Հավաքեք արտակարգ իրավիճակի որևէ համար:"</string> <string name="dial_emergency_calling_not_available" msgid="5675557523782491826">"Շտապ կանչերը հասանելի չեն"</string> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 6d9d8321c..8ff1b32b8 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -397,16 +397,16 @@ <string name="disable_fdn" msgid="7944020890722540616">"השבתת מספרי חיוג קבועים"</string> <string name="change_pin2" msgid="2153563695382176676">"שנה PIN2"</string> <string name="enable_fdn_ok" msgid="7215588870329688132">"השבת מספרי חיוג קבועים"</string> - <string name="disable_fdn_ok" msgid="5727046928930740173">"הפעל מספרי חיוג קבועים"</string> + <string name="disable_fdn_ok" msgid="5727046928930740173">"הפעלה של מספרי חיוג קבועים"</string> <string name="sum_fdn" msgid="1959399454900272878">"ניהול מספרי חיוג קבועים"</string> <string name="sum_fdn_change_pin" msgid="6666549734792827932">"שנה את קוד הגישה למספרי חיוג קבועים"</string> <string name="sum_fdn_manage_list" msgid="8431088265332628316">"ניהול רשימת מספרי טלפון"</string> <string name="voice_privacy" msgid="3776841382844614716">"פרטיות קול"</string> - <string name="voice_privacy_summary" msgid="3159383389833516214">"הפוך מצב פרטיות משופרת לפעיל"</string> + <string name="voice_privacy_summary" msgid="3159383389833516214">"הפעלת מצב פרטיות משופרת"</string> <string name="tty_mode_option_title" msgid="9033098925144434669">"מצב TTY"</string> <string name="tty_mode_option_summary" msgid="1073835131534808732">"הגדר מצב TTY"</string> <string name="auto_retry_mode_title" msgid="4073265511427813322">"ניסיון חוזר אוטומטי"</string> - <string name="auto_retry_mode_summary" msgid="4973886004067532288">"אפשר מצב \'ניסיון חוזר\'."</string> + <string name="auto_retry_mode_summary" msgid="4973886004067532288">"הפעלת מצב \'ניסיון חוזר\'."</string> <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"שינוי מצב TTY אינו מותר במהלך שיחת וידאו"</string> <string name="menu_add" msgid="1882023737425114762">"הוסף איש קשר"</string> <string name="menu_edit" msgid="7143003705504672374">"ערוך איש קשר"</string> @@ -433,7 +433,7 @@ <string name="simContacts_empty" msgid="5270660846489561932">"אין אנשי קשר בכרטיס ה-SIM."</string> <string name="simContacts_title" msgid="1861472842524839921">"בחר אנשי קשר לייבוא"</string> <string name="simContacts_airplaneMode" msgid="5254946758982621072">"בטל את מצב טיסה כדי לייבא אנשי קשר מכרטיס ה-SIM."</string> - <string name="enable_pin" msgid="5422767284133234860">"הפוך לפעיל/השבת PIN של SIM"</string> + <string name="enable_pin" msgid="5422767284133234860">"הפעלה/השבתה של ה-PIN של SIM"</string> <string name="change_pin" msgid="9174186126330785343">"שנה PIN של SIM"</string> <string name="enter_pin_text" msgid="8532615714751931951">"PIN של SIM:"</string> <string name="oldPinLabel" msgid="5287773661246368314">"PIN ישן"</string> @@ -576,7 +576,7 @@ <string name="ota_unsuccessful" msgid="8072141612635635357">"הטלפון שלך לא הופעל. \nייתכן שעליך למצוא מקום שהקליטה בו טובה יותר (ליד חלון או בחוץ). \n\nנסה שוב או התקשר לשירות לקוחות לקבלת אפשרויות נוספות."</string> <string name="ota_spc_failure" msgid="3909983542575030796">"כשלים מרובים של SPC"</string> <string name="ota_call_end" msgid="4537279738134612388">"הקודם"</string> - <string name="ota_try_again" msgid="7685477206465902290">"נסה שוב"</string> + <string name="ota_try_again" msgid="7685477206465902290">"נסו שוב"</string> <string name="ota_next" msgid="3904945374358235910">"הבא"</string> <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string> <string name="phone_entered_ecm_text" msgid="6266424252578731203">"נכנס למצב חירום של התקשרות חזרה"</string> @@ -627,7 +627,7 @@ <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"נגישות"</string> <string name="status_hint_label_incoming_wifi_call" msgid="5932176406432044638">"שיחת Wi-Fi מאת"</string> <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"שיחת Wi-Fi"</string> - <string name="emergency_action_launch_hint" msgid="4906759256275562674">"הקש שוב כדי לפתוח"</string> + <string name="emergency_action_launch_hint" msgid="4906759256275562674">"יש להקיש שוב כדי לפתוח"</string> <string name="message_decode_error" msgid="3456481534066924855">"אירעה שגיאה בעת פענוח ההודעה."</string> <string name="callFailed_cdma_activation" msgid="2307989779233262164">"כרטיס SIM הפעיל את השירות שלך ועדכן את יכולות הנדידה של הטלפון."</string> <string name="callFailed_cdma_call_limit" msgid="1556916577171457086">"יש יותר מדי שיחות פעילות. כדי להתחיל שיחה חדשה עליך לסיים או למזג חלק מהשיחות הפעילות."</string> diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index 01991ee60..099ffb593 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -405,8 +405,8 @@ <string name="voice_privacy_summary" msgid="3159383389833516214">"Жетілдірілген құпиялылық режимін қосу"</string> <string name="tty_mode_option_title" msgid="9033098925144434669">"Tелетайп режимі"</string> <string name="tty_mode_option_summary" msgid="1073835131534808732">"Телетайп режиміне реттеу"</string> - <string name="auto_retry_mode_title" msgid="4073265511427813322">"Қайта авто әрекеттену"</string> - <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Қайта авто әрекеттену режимін қосу"</string> + <string name="auto_retry_mode_title" msgid="4073265511427813322">"Әрекетті автоматты қайталау"</string> + <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Әрекетті автоматты қайталау режимін қосу"</string> <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Бейне қоңырау барысында Телетайп режимін өзгертуге рұқсат етілмеген"</string> <string name="menu_add" msgid="1882023737425114762">"Байланыс қосу"</string> <string name="menu_edit" msgid="7143003705504672374">"Байланыс өңдеу"</string> diff --git a/res/values-mcc204-mnc04/strings.xml b/res/values-mcc204-mnc04/strings.xml index fec694f48..9708836fc 100644 --- a/res/values-mcc204-mnc04/strings.xml +++ b/res/values-mcc204-mnc04/strings.xml @@ -16,4 +16,6 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string translatable="false" name="config_world_mode">true;BAE0000000000000</string> + <string translatable="false" name="config_world_mode_spn">true;U.S. CELLULAR</string> + <string translatable="false" name="config_show_gsm_option">true;U.S. CELLULAR</string> </resources> diff --git a/res/values-mcc311-mnc220/strings.xml b/res/values-mcc311-mnc220/strings.xml new file mode 100644 index 000000000..52ba286f1 --- /dev/null +++ b/res/values-mcc311-mnc220/strings.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2019 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"> + <string translatable="false" name="config_world_mode">true</string> + <string translatable="false" name="config_show_gsm_option">true</string> +</resources> diff --git a/res/values-mcc311-mnc225/strings.xml b/res/values-mcc311-mnc225/strings.xml new file mode 100644 index 000000000..52ba286f1 --- /dev/null +++ b/res/values-mcc311-mnc225/strings.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2019 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"> + <string translatable="false" name="config_world_mode">true</string> + <string translatable="false" name="config_show_gsm_option">true</string> +</resources> diff --git a/res/values-mcc311-mnc580/strings.xml b/res/values-mcc311-mnc580/strings.xml new file mode 100644 index 000000000..52ba286f1 --- /dev/null +++ b/res/values-mcc311-mnc580/strings.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2019 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"> + <string translatable="false" name="config_world_mode">true</string> + <string translatable="false" name="config_show_gsm_option">true</string> +</resources> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 2de167f95..f44daa477 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -326,9 +326,9 @@ <item msgid="5511864807618312598">"7"</item> </string-array> <string name="list_language_dtitle" msgid="5442908726538951934">"Idiomas"</string> - <string name="enable_disable_local_weather" msgid="986967454867219114">"Clima local"</string> - <string name="local_weather_enable" msgid="6199315114382448922">"Clima local ativado"</string> - <string name="local_weather_disable" msgid="2510158089142626480">"Clima local desativado"</string> + <string name="enable_disable_local_weather" msgid="986967454867219114">"Previsão do tempo local"</string> + <string name="local_weather_enable" msgid="6199315114382448922">"Previsão do tempo ativada"</string> + <string name="local_weather_disable" msgid="2510158089142626480">"Previsão do tempo desativada"</string> <string name="enable_disable_atr" msgid="8339572391278872343">"Relatórios de trânsito da área"</string> <string name="atr_enable" msgid="5541757457789181799">"Relatórios de trânsito da área ativados"</string> <string name="atr_disable" msgid="7085558154727596455">"Relatórios de trânsito da área desativados"</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 905352095..62c03ca54 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1797,4 +1797,8 @@ <!-- Message displayed to the user to indicate that a held call has been released / disconnected. --> <string name="supp_service_held_call_released">Held call has been released.</string> + <!-- Configuration setting for world mode Format is <true;SPN if any to be checked>--> + <string translatable="false" name="config_world_mode_spn">false</string> + <!-- Configuration setting for mobile network settings show network option by phoneType. Format is <true;SPN if any to be checked>--> + <string translatable="false" name="config_show_gsm_option">false</string> </resources> diff --git a/sip/res/values-be/strings.xml b/sip/res/values-be/strings.xml index 2252024a5..96104cd6d 100644 --- a/sip/res/values-be/strings.xml +++ b/sip/res/values-be/strings.xml @@ -53,7 +53,7 @@ <string name="domain_address_title" msgid="1968479941328225423">"Сервер"</string> <string name="username_title" msgid="6770064611005663470">"Імя карыстальніка"</string> <string name="password_title" msgid="5289013731515564295">"Пароль"</string> - <string name="display_name_title" msgid="579241787583079773">"Бачнае імя"</string> + <string name="display_name_title" msgid="579241787583079773">"Бачная назва"</string> <string name="proxy_address_title" msgid="6890163365640631841">"Адрас выходнага проксі-сервера"</string> <string name="port_title" msgid="6693965912656593862">"Нумар порта"</string> <string name="transport_title" msgid="889155457465372527">"Тып транспарту"</string> diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java index f128f9a98..745a7ff9d 100644 --- a/src/com/android/phone/MobileNetworkSettings.java +++ b/src/com/android/phone/MobileNetworkSettings.java @@ -1708,7 +1708,12 @@ public class MobileNetworkSettings extends Activity { } else { if (isWorldMode()) { controlCdmaOptions(true); - controlGsmOptions(false); + if (showNetworkOptionByPhoneType() + && mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_GSM) { + controlGsmOptions(true); + } else { + controlGsmOptions(false); + } } mButtonEnabledNetworks.setValue( Integer.toString(Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA)); @@ -1931,20 +1936,59 @@ public class MobileNetworkSettings extends Activity { return super.onOptionsItemSelected(item); } + private boolean showNetworkOptionByPhoneType() { + boolean showByPhoneType = false; + final String configString = getResources().getString( + R.string.config_show_gsm_option); + + if (!TextUtils.isEmpty(configString)) { + String[] configArray = configString.split(";"); + // Check if we have showNetworkOptionByPhoneType configuration set to True only + // or config is set to True and SIM SPN value is also set and matches to the + // current SIM SPN. + if (configArray != null && ( + (configArray.length == 1 && configArray[0].equalsIgnoreCase("true")) + || (configArray.length == 2 && !TextUtils.isEmpty(configArray[1]) + && mTelephonyManager != null + && configArray[1].equalsIgnoreCase( + mTelephonyManager.getSimOperatorName())))) { + showByPhoneType = true; + } + } + Log.d(LOG_TAG, "showNetworkOptionByPhoneType=" + showByPhoneType); + + return showByPhoneType; + } + private boolean isWorldMode() { boolean worldModeOn = false; final String configString = getResources().getString(R.string.config_world_mode); + final String configStringSpn = getResources().getString(R.string.config_world_mode_spn); if (!TextUtils.isEmpty(configString)) { String[] configArray = configString.split(";"); - // Check if we have World mode configuration set to True only or config is set to True - // and SIM GID value is also set and matches to the current SIM GID. + // Check if we have World mode configuration set to True only or config is set to + // True and SIM GID value is also set and matches to the current SIM GID. if (configArray != null && ((configArray.length == 1 && configArray[0].equalsIgnoreCase("true")) || (configArray.length == 2 && !TextUtils.isEmpty(configArray[1]) && mTelephonyManager != null && configArray[1].equalsIgnoreCase( - mTelephonyManager.getGroupIdLevel1())))) { + mTelephonyManager.getGroupIdLevel1())))) { + worldModeOn = true; + } + } + if (!worldModeOn && !TextUtils.isEmpty(configStringSpn)) { + String[] configArray = configStringSpn.split(";"); + // Check if we have World mode configuration set to True only or config is set to + // True and SIM SPN value is also set and matches to the current SIM SPN. + if (configArray != null + && configArray.length == 2 && !TextUtils.isEmpty(configArray[0]) + && !TextUtils.isEmpty(configArray[1]) + && configArray[0].equalsIgnoreCase("true") + && mTelephonyManager != null + && configArray[1].equalsIgnoreCase( + mTelephonyManager.getSimOperatorName())) { worldModeOn = true; } } |