Merge "Add action bar to display the option menu items" am: 255c972b61 am: 0c135c812f
am: 3415e18361 -s ours
Change-Id: I9f9c376d1dba614462ce829e00fb29d4bc81d7ec
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ca242f9..aef271d 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -102,10 +102,10 @@
<receiver android:name="com.android.stk.StkCmdReceiver">
<intent-filter>
- <action android:name= "android.intent.action.stk.command" />
- <action android:name= "android.intent.action.stk.session_end" />
- <action android:name= "android.intent.action.stk.icc_status_change" />
- <action android:name= "android.intent.action.stk.alpha_notify" />
+ <action android:name= "com.android.internal.stk.command" />
+ <action android:name= "com.android.internal.stk.session_end" />
+ <action android:name= "com.android.internal.stk.icc_status_change" />
+ <action android:name= "com.android.internal.stk.alpha_notify" />
<action android:name= "android.intent.action.LOCALE_CHANGED" />
</intent-filter>
</receiver>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az/strings.xml
similarity index 100%
rename from res/values-az-rAZ/strings.xml
rename to res/values-az/strings.xml
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
new file mode 100644
index 0000000..3a3c907
--- /dev/null
+++ b/res/values-be/strings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 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:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8396461461738434341">"Інструменты SIM"</string>
+ <string name="menu_end_session" msgid="7368541737750982217">"Скончыць сеанс"</string>
+ <string name="help" msgid="9209980881219397319">"Даведка"</string>
+ <string name="menu_back" msgid="301227740977453364">"Назад"</string>
+ <string name="service_name" msgid="6860303747999592491">"Імя службы"</string>
+ <string name="stk_no_service" msgid="5427773116839809131">"Абслугоўванне недаступна"</string>
+ <string name="button_ok" msgid="5760722312558549555">"ОК"</string>
+ <string name="button_cancel" msgid="1997847915560800261">"Скасаваць"</string>
+ <string name="button_yes" msgid="624420260648337203">"Так"</string>
+ <string name="button_no" msgid="1824959157582605627">"Не"</string>
+ <string name="alphabet" msgid="1583185545938805861">"Літары"</string>
+ <string name="digits" msgid="1746796679021682388">"Лічбы (0-9, *, #, +)"</string>
+ <string name="default_call_setup_msg" msgid="7960194995759849940">"Ідзе выклік..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Выклік наладжваецца"</string>
+ <string name="stk_app_state" msgid="18582277302584082">"Стан прыкладання"</string>
+ <string name="enable_app" msgid="3701224550936728203">"Уключана"</string>
+ <string name="disable_app" msgid="6725081975611415214">"Адключана"</string>
+ <string name="stk_dialog_title" msgid="6954825385456886726">"Інструменты SIM"</string>
+ <string name="default_open_channel_msg" msgid="2216070254100295924">"Адкрыты канал?"</string>
+ <string name="default_send_data_msg" msgid="6011219698689931272">"Адпраўка дадзеных"</string>
+ <string name="default_receive_data_msg" msgid="618096941772010682">"Атрыманне дадзеных"</string>
+ <string name="default_close_channel_msg" msgid="765364262263839824">"Канал закрыты"</string>
+ <string name="stk_dialog_accept" msgid="8498901537508923727">"ТАК"</string>
+ <string name="stk_dialog_reject" msgid="921848059485746796">"НЕ"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Калі ласка, устаўце SIM-карту, каб запусціць Інструменты SIM."</string>
+</resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn/strings.xml
similarity index 92%
rename from res/values-bn-rBD/strings.xml
rename to res/values-bn/strings.xml
index bdcbafa..e938899 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="8396461461738434341">"SIM টুলকিট"</string>
+ <string name="app_name" msgid="8396461461738434341">"সিম টুলকিট"</string>
<string name="menu_end_session" msgid="7368541737750982217">"সেশন শেষ করুন"</string>
<string name="help" msgid="9209980881219397319">"সহায়তা"</string>
<string name="menu_back" msgid="301227740977453364">"ফিরুন"</string>
@@ -33,12 +33,12 @@
<string name="stk_app_state" msgid="18582277302584082">"অ্যাপ্লিকেশান অবস্থা"</string>
<string name="enable_app" msgid="3701224550936728203">"সক্ষম"</string>
<string name="disable_app" msgid="6725081975611415214">"অক্ষম করা হয়েছে"</string>
- <string name="stk_dialog_title" msgid="6954825385456886726">"SIM টুলকিট"</string>
+ <string name="stk_dialog_title" msgid="6954825385456886726">"সিম টুলকিট"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"চ্যানেল খুলুন?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"ডেটা পাঠানো হচ্ছে"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"ডেটা গৃহীত হচ্ছে"</string>
<string name="default_close_channel_msg" msgid="765364262263839824">"চ্যানেল বন্ধ"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"হ্যাঁ"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"না"</string>
- <string name="no_sim_card_inserted" msgid="5316620398365235988">"SIM টুলকিট লঞ্চ করতে দয়া করে SIM ঢোকান৷"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"সিম টুলকিট লঞ্চ করতে দয়া করে সিম ঢোকান৷"</string>
</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
new file mode 100644
index 0000000..d6a2bcd
--- /dev/null
+++ b/res/values-bs/strings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 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:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8396461461738434341">"SIM Toolkit"</string>
+ <string name="menu_end_session" msgid="7368541737750982217">"Završiti sesiju"</string>
+ <string name="help" msgid="9209980881219397319">"Pomoć"</string>
+ <string name="menu_back" msgid="301227740977453364">"Nazad"</string>
+ <string name="service_name" msgid="6860303747999592491">"Ime usluge"</string>
+ <string name="stk_no_service" msgid="5427773116839809131">"Usluga nije dostupna"</string>
+ <string name="button_ok" msgid="5760722312558549555">"UREDU"</string>
+ <string name="button_cancel" msgid="1997847915560800261">"Otkaži"</string>
+ <string name="button_yes" msgid="624420260648337203">"Da"</string>
+ <string name="button_no" msgid="1824959157582605627">"Ne"</string>
+ <string name="alphabet" msgid="1583185545938805861">"Pisma"</string>
+ <string name="digits" msgid="1746796679021682388">"Znamenke (0-9, *, #, +)"</string>
+ <string name="default_call_setup_msg" msgid="7960194995759849940">"Poziv u toku"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Poziv se uspostavlja"</string>
+ <string name="stk_app_state" msgid="18582277302584082">"Stanje aplikacije"</string>
+ <string name="enable_app" msgid="3701224550936728203">"Omogućeno"</string>
+ <string name="disable_app" msgid="6725081975611415214">"Onemogućeno"</string>
+ <string name="stk_dialog_title" msgid="6954825385456886726">"SIM ToolKit"</string>
+ <string name="default_open_channel_msg" msgid="2216070254100295924">"Otvoriti kanal?"</string>
+ <string name="default_send_data_msg" msgid="6011219698689931272">"Slanje podataka"</string>
+ <string name="default_receive_data_msg" msgid="618096941772010682">"Primanje podataka"</string>
+ <string name="default_close_channel_msg" msgid="765364262263839824">"Kanal je zatvoren"</string>
+ <string name="stk_dialog_accept" msgid="8498901537508923727">"DA"</string>
+ <string name="stk_dialog_reject" msgid="921848059485746796">"NE"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Ubacite SIM karticu kako biste pokrenuli SIM Toolkit."</string>
+</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et/strings.xml
similarity index 100%
rename from res/values-et-rEE/strings.xml
rename to res/values-et/strings.xml
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu/strings.xml
similarity index 100%
rename from res/values-eu-rES/strings.xml
rename to res/values-eu/strings.xml
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 5f1f98a..723eab4 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -29,7 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"الفبا"</string>
<string name="digits" msgid="1746796679021682388">"ارقام (0-9، *، #، +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"تماس در حال انجام..."</string>
- <string name="default_setup_call_msg" msgid="6126904475461162162">"تماس در حال تنظیم"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"تماس درحال راهاندازی"</string>
<string name="stk_app_state" msgid="18582277302584082">"حالت برنامه"</string>
<string name="enable_app" msgid="3701224550936728203">"فعال شد"</string>
<string name="disable_app" msgid="6725081975611415214">"غیرفعال شد"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl/strings.xml
similarity index 100%
rename from res/values-gl-rES/strings.xml
rename to res/values-gl/strings.xml
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu/strings.xml
similarity index 97%
rename from res/values-gu-rIN/strings.xml
rename to res/values-gu/strings.xml
index bb1750c..77052fe 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu/strings.xml
@@ -22,7 +22,7 @@
<string name="menu_back" msgid="301227740977453364">"પાછળ"</string>
<string name="service_name" msgid="6860303747999592491">"સેવાનું નામ"</string>
<string name="stk_no_service" msgid="5427773116839809131">"કોઈ સેવા ઉપલબ્ધ નથી"</string>
- <string name="button_ok" msgid="5760722312558549555">"ઑકે"</string>
+ <string name="button_ok" msgid="5760722312558549555">"ઓકે"</string>
<string name="button_cancel" msgid="1997847915560800261">"રદ કરો"</string>
<string name="button_yes" msgid="624420260648337203">"હા"</string>
<string name="button_no" msgid="1824959157582605627">"નહીં"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy/strings.xml
similarity index 100%
rename from res/values-hy-rAM/strings.xml
rename to res/values-hy/strings.xml
diff --git a/res/values-is-rIS/strings.xml b/res/values-is/strings.xml
similarity index 100%
rename from res/values-is-rIS/strings.xml
rename to res/values-is/strings.xml
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka/strings.xml
similarity index 100%
rename from res/values-ka-rGE/strings.xml
rename to res/values-ka/strings.xml
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk/strings.xml
similarity index 100%
rename from res/values-kk-rKZ/strings.xml
rename to res/values-kk/strings.xml
diff --git a/res/values-km-rKH/strings.xml b/res/values-km/strings.xml
similarity index 100%
rename from res/values-km-rKH/strings.xml
rename to res/values-km/strings.xml
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn/strings.xml
similarity index 98%
rename from res/values-kn-rIN/strings.xml
rename to res/values-kn/strings.xml
index 25f760b..795c6b9 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn/strings.xml
@@ -23,7 +23,7 @@
<string name="service_name" msgid="6860303747999592491">"ಸೇವೆಯ ಹೆಸರು"</string>
<string name="stk_no_service" msgid="5427773116839809131">"ಯಾವುದೇ ಸೇವೆ ಲಭ್ಯವಿಲ್ಲ"</string>
<string name="button_ok" msgid="5760722312558549555">"ಸರಿ"</string>
- <string name="button_cancel" msgid="1997847915560800261">"ರದ್ದುಮಾಡು"</string>
+ <string name="button_cancel" msgid="1997847915560800261">"ರದ್ದುಮಾಡಿ"</string>
<string name="button_yes" msgid="624420260648337203">"ಹೌದು"</string>
<string name="button_no" msgid="1824959157582605627">"ಇಲ್ಲ"</string>
<string name="alphabet" msgid="1583185545938805861">"ವರ್ಣಮಾಲೆಗಳು"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky/strings.xml
similarity index 100%
rename from res/values-ky-rKG/strings.xml
rename to res/values-ky/strings.xml
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo/strings.xml
similarity index 100%
rename from res/values-lo-rLA/strings.xml
rename to res/values-lo/strings.xml
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk/strings.xml
similarity index 100%
rename from res/values-mk-rMK/strings.xml
rename to res/values-mk/strings.xml
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml/strings.xml
similarity index 100%
rename from res/values-ml-rIN/strings.xml
rename to res/values-ml/strings.xml
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn/strings.xml
similarity index 97%
rename from res/values-mn-rMN/strings.xml
rename to res/values-mn/strings.xml
index fa58f0e..e2b7a86 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn/strings.xml
@@ -22,7 +22,7 @@
<string name="menu_back" msgid="301227740977453364">"Буцах"</string>
<string name="service_name" msgid="6860303747999592491">"Үйлчилгээний нэр"</string>
<string name="stk_no_service" msgid="5427773116839809131">"Ашиглах боломжтой үйлчилгээ байхгүй"</string>
- <string name="button_ok" msgid="5760722312558549555">"Тийм"</string>
+ <string name="button_ok" msgid="5760722312558549555">"OK"</string>
<string name="button_cancel" msgid="1997847915560800261">"Цуцлах"</string>
<string name="button_yes" msgid="624420260648337203">"Тийм"</string>
<string name="button_no" msgid="1824959157582605627">"Үгүй"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr/strings.xml
similarity index 100%
rename from res/values-mr-rIN/strings.xml
rename to res/values-mr/strings.xml
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms/strings.xml
similarity index 100%
rename from res/values-ms-rMY/strings.xml
rename to res/values-ms/strings.xml
diff --git a/res/values-my-rMM/strings.xml b/res/values-my/strings.xml
similarity index 88%
rename from res/values-my-rMM/strings.xml
rename to res/values-my/strings.xml
index e66a882..8853d46 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my/strings.xml
@@ -19,18 +19,18 @@
<string name="app_name" msgid="8396461461738434341">"SIM တူးလ်ကစ်"</string>
<string name="menu_end_session" msgid="7368541737750982217">"သတ်မှတ်ကဏ္ဏကို ပြီးဆုံးမည်"</string>
<string name="help" msgid="9209980881219397319">"အကူအညီ"</string>
- <string name="menu_back" msgid="301227740977453364">"နောက်ပြန်"</string>
+ <string name="menu_back" msgid="301227740977453364">"နောက်သို့"</string>
<string name="service_name" msgid="6860303747999592491">"ဝန်ဆောင်မှုအမည်"</string>
<string name="stk_no_service" msgid="5427773116839809131">"ဆက်သွယ်ချိတ်ဆက်ရန် ဝန်ဆောင်မှု တစ်ခုမှမရှိပါ"</string>
- <string name="button_ok" msgid="5760722312558549555">"ကောင်းပြီ"</string>
- <string name="button_cancel" msgid="1997847915560800261">"ထားတော့"</string>
- <string name="button_yes" msgid="624420260648337203">"မှန်ပါသည်"</string>
- <string name="button_no" msgid="1824959157582605627">"မဟုတ်ပါ"</string>
+ <string name="button_ok" msgid="5760722312558549555">"အိုကေ"</string>
+ <string name="button_cancel" msgid="1997847915560800261">"မလုပ်တော့"</string>
+ <string name="button_yes" msgid="624420260648337203">"Yes"</string>
+ <string name="button_no" msgid="1824959157582605627">"No"</string>
<string name="alphabet" msgid="1583185545938805861">"အက္ခရာများ"</string>
<string name="digits" msgid="1746796679021682388">"ဂဏန်းများ (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"ခေါ်ဆိုနေပါသည်"</string>
<string name="default_setup_call_msg" msgid="6126904475461162162">"ခေါ်ဆိုရန် သတ်မှတ်ပြင်ဆင်ပြီး"</string>
- <string name="stk_app_state" msgid="18582277302584082">"အပ်ပလီကေးရှင်းအနေအထား"</string>
+ <string name="stk_app_state" msgid="18582277302584082">"အပလီကေးရှင်းအနေအထား"</string>
<string name="enable_app" msgid="3701224550936728203">"ဖွင့်ထားသည်"</string>
<string name="disable_app" msgid="6725081975611415214">"သုံးမရအောင် ပိတ်ထားခြင်း"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM တူးလ်ကစ်"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne/strings.xml
similarity index 100%
rename from res/values-ne-rNP/strings.xml
rename to res/values-ne/strings.xml
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa/strings.xml
similarity index 92%
rename from res/values-pa-rIN/strings.xml
rename to res/values-pa/strings.xml
index 240e175..14e2c14 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa/strings.xml
@@ -18,7 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="8396461461738434341">"SIM Toolkit"</string>
<string name="menu_end_session" msgid="7368541737750982217">"ਸੈਸ਼ਨ ਖ਼ਤਮ ਕਰੋ"</string>
- <string name="help" msgid="9209980881219397319">"ਸਹਾਇਤਾ"</string>
+ <string name="help" msgid="9209980881219397319">"ਮਦਦ"</string>
<string name="menu_back" msgid="301227740977453364">"ਪਿੱਛੇ"</string>
<string name="service_name" msgid="6860303747999592491">"ਸੇਵਾ ਦਾ ਨਾਮ"</string>
<string name="stk_no_service" msgid="5427773116839809131">"ਕੋਈ ਸੇਵਾ ਉਪਲਬਧ ਨਹੀਂ"</string>
@@ -32,11 +32,11 @@
<string name="default_setup_call_msg" msgid="6126904475461162162">"ਕਾਲ ਸੈਟਅਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
<string name="stk_app_state" msgid="18582277302584082">"ਐਪਲੀਕੇਸ਼ਨ ਸਥਿਤੀ"</string>
<string name="enable_app" msgid="3701224550936728203">"ਸਮਰੱਥ ਬਣਾਇਆ"</string>
- <string name="disable_app" msgid="6725081975611415214">"ਅਸਮਰੱਥ ਬਣਾਇਆ"</string>
+ <string name="disable_app" msgid="6725081975611415214">"ਅਯੋਗ ਬਣਾਇਆ"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM ToolKit"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"ਕੀ ਚੈਨਲ ਖੋਲ੍ਹਣਾ ਹੈ?"</string>
- <string name="default_send_data_msg" msgid="6011219698689931272">"ਡਾਟਾ ਭੇਜ ਰਿਹਾ ਹੈ"</string>
- <string name="default_receive_data_msg" msgid="618096941772010682">"ਡਾਟਾ ਪ੍ਰਾਪਤ ਕਰ ਰਿਹਾ ਹੈ"</string>
+ <string name="default_send_data_msg" msgid="6011219698689931272">"ਡੈਟਾ ਭੇਜ ਰਿਹਾ ਹੈ"</string>
+ <string name="default_receive_data_msg" msgid="618096941772010682">"ਡੈਟਾ ਪ੍ਰਾਪਤ ਕਰ ਰਿਹਾ ਹੈ"</string>
<string name="default_close_channel_msg" msgid="765364262263839824">"ਚੈਨਲ ਬੰਦ ਕੀਤਾ"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"ਹਾਂ"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"ਨਹੀਂ"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1e56049..e8ef4bb 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -17,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="8396461461738434341">"SIM Toolkit"</string>
- <string name="menu_end_session" msgid="7368541737750982217">"Sfârşitul sesiunii"</string>
+ <string name="menu_end_session" msgid="7368541737750982217">"Sfârșitul sesiunii"</string>
<string name="help" msgid="9209980881219397319">"Ajutor"</string>
<string name="menu_back" msgid="301227740977453364">"Înapoi"</string>
<string name="service_name" msgid="6860303747999592491">"Nume serviciu"</string>
@@ -34,7 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Activat"</string>
<string name="disable_app" msgid="6725081975611415214">"Dezactivat"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM Toolkit"</string>
- <string name="default_open_channel_msg" msgid="2216070254100295924">"Deschideţi canalul?"</string>
+ <string name="default_open_channel_msg" msgid="2216070254100295924">"Deschideți canalul?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Se trimit date"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Se primesc date"</string>
<string name="default_close_channel_msg" msgid="765364262263839824">"Canal închis"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si/strings.xml
similarity index 100%
rename from res/values-si-rLK/strings.xml
rename to res/values-si/strings.xml
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq/strings.xml
similarity index 100%
rename from res/values-sq-rAL/strings.xml
rename to res/values-sq/strings.xml
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta/strings.xml
similarity index 100%
rename from res/values-ta-rIN/strings.xml
rename to res/values-ta/strings.xml
diff --git a/res/values-te-rIN/strings.xml b/res/values-te/strings.xml
similarity index 100%
rename from res/values-te-rIN/strings.xml
rename to res/values-te/strings.xml
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur/strings.xml
similarity index 100%
rename from res/values-ur-rPK/strings.xml
rename to res/values-ur/strings.xml
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz/strings.xml
similarity index 95%
rename from res/values-uz-rUZ/strings.xml
rename to res/values-uz/strings.xml
index eab6544..b1a0967 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="8396461461738434341">"SIM vositalar majmuasi"</string>
+ <string name="app_name" msgid="8396461461738434341">"SIM karta menyusi"</string>
<string name="menu_end_session" msgid="7368541737750982217">"Sessiyani yakunlash"</string>
<string name="help" msgid="9209980881219397319">"Yordam"</string>
<string name="menu_back" msgid="301227740977453364">"Orqaga"</string>
@@ -33,7 +33,7 @@
<string name="stk_app_state" msgid="18582277302584082">"Ilova holati"</string>
<string name="enable_app" msgid="3701224550936728203">"Yoniq"</string>
<string name="disable_app" msgid="6725081975611415214">"O‘chiq"</string>
- <string name="stk_dialog_title" msgid="6954825385456886726">"SIM vositalar majmuasi"</string>
+ <string name="stk_dialog_title" msgid="6954825385456886726">"SIM karta menyusi"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Kanal ochilsinmi?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Ma’lumot yuborilmoqda"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Ma’lumot qabul qilinmoqda"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ea50e85..bdf49da 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -62,4 +62,5 @@
<string name="stk_dialog_accept">YES</string>
<string name="stk_dialog_reject">NO</string>
<string name="no_sim_card_inserted">Please insert SIM to launch SIM Toolkit.</string>
+ <string name="stk_channel_name">Mobile service messages</string>
</resources>
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index 91ae3d3..0033662 100755
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -20,18 +20,14 @@
import android.app.ActivityManager.RunningTaskInfo;
import android.app.AlertDialog;
import android.app.Notification;
+import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.Service;
import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.ActivityManager.RecentTaskInfo;
-import android.app.ActivityManager.RunningAppProcessInfo;
-import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
-import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.Uri;
@@ -50,22 +46,16 @@
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
-import android.view.Window;
import android.view.WindowManager;
import android.widget.ImageView;
-import android.widget.RemoteViews;
import android.widget.TextView;
import android.widget.Toast;
-import android.content.BroadcastReceiver;
import android.content.IntentFilter;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
import com.android.internal.telephony.cat.AppInterface;
import com.android.internal.telephony.cat.LaunchBrowserMode;
import com.android.internal.telephony.cat.Menu;
import com.android.internal.telephony.cat.Item;
-import com.android.internal.telephony.cat.Input;
import com.android.internal.telephony.cat.ResultCode;
import com.android.internal.telephony.cat.CatCmdMessage;
import com.android.internal.telephony.cat.CatCmdMessage.BrowserSettings;
@@ -74,11 +64,7 @@
import com.android.internal.telephony.cat.CatResponseMessage;
import com.android.internal.telephony.cat.TextMessage;
import com.android.internal.telephony.uicc.IccRefreshResponse;
-import com.android.internal.telephony.uicc.IccCardStatus.CardState;
import com.android.internal.telephony.PhoneConstants;
-import com.android.internal.telephony.TelephonyIntents;
-import com.android.internal.telephony.IccCardConstants;
-import com.android.internal.telephony.uicc.UiccController;
import com.android.internal.telephony.GsmAlphabet;
import com.android.internal.telephony.cat.CatService;
@@ -238,6 +224,9 @@
private static final String STK_DIALOG_ACTIVITY_NAME = PACKAGE_NAME + ".StkDialogActivity";
// Notification id used to display Idle Mode text in NotificationManager.
private static final int STK_NOTIFICATION_ID = 333;
+ // Notification channel containing all mobile service messages notifications.
+ private static final String STK_NOTIFICATION_CHANNEL_ID = "mobileServiceMessages";
+
private static final String LOG_TAG = new Object(){}.getClass().getEnclosingClass().getName();
// Inner class used for queuing telephony messages (proactive commands,
@@ -587,6 +576,8 @@
for (int slot = PhoneConstants.SIM_ID_1; slot < mSimCount; slot++) {
checkForSetupEvent(LANGUAGE_SELECTION_EVENT, (Bundle) msg.obj, slot);
}
+ // rename all registered notification channels on locale change
+ createAllChannels();
break;
case OP_ALPHA_NOTIFY:
handleAlphaNotify((Bundle) msg.obj);
@@ -1583,9 +1574,9 @@
CatLog.d(LOG_TAG, "Add IdleMode text");
PendingIntent pendingIntent = PendingIntent.getService(mContext, 0,
new Intent(mContext, StkAppService.class), 0);
-
+ createAllChannels();
final Notification.Builder notificationBuilder = new Notification.Builder(
- StkAppService.this);
+ StkAppService.this, STK_NOTIFICATION_CHANNEL_ID);
if (mStkContext[slotId].mMainCmd != null &&
mStkContext[slotId].mMainCmd.getMenu() != null) {
notificationBuilder.setContentTitle(mStkContext[slotId].mMainCmd.getMenu().title);
@@ -1616,6 +1607,17 @@
}
}
+ /** Creates the notification channel and registers it with NotificationManager.
+ * If a channel with the same ID is already registered, NotificationManager will
+ * ignore this call.
+ */
+ private void createAllChannels() {
+ mNotificationManager.createNotificationChannel(new NotificationChannel(
+ STK_NOTIFICATION_CHANNEL_ID,
+ getResources().getString(R.string.stk_channel_name),
+ NotificationManager.IMPORTANCE_MIN));
+ }
+
private void launchToneDialog(int slotId) {
Intent newIntent = new Intent(this, ToneDialog.class);
String uriString = STK_TONE_URI + slotId;
diff --git a/src/com/android/stk/ToneDialog.java b/src/com/android/stk/ToneDialog.java
index 834d575..fa6e9d3 100755
--- a/src/com/android/stk/ToneDialog.java
+++ b/src/com/android/stk/ToneDialog.java
@@ -17,12 +17,14 @@
package com.android.stk;
import android.app.Activity;
+import android.app.AlertDialog;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.os.Vibrator;
import android.view.KeyEvent;
+import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.widget.ImageView;
@@ -73,14 +75,13 @@
initFromIntent(getIntent());
- // remove window title
- View title = findViewById(com.android.internal.R.id.title);
- title.setVisibility(View.GONE);
- // set customized content view
- setContentView(R.layout.stk_tone_dialog);
+ AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+ LayoutInflater inflater = this.getLayoutInflater();
+ View dialogView = inflater.inflate(R.layout.stk_tone_dialog, null);
+ alertDialogBuilder.setView(dialogView);
- TextView tv = (TextView) findViewById(R.id.message);
- ImageView iv = (ImageView) findViewById(R.id.icon);
+ TextView tv = (TextView) dialogView.findViewById(R.id.message);
+ ImageView iv = (ImageView) dialogView.findViewById(R.id.icon);
// set text and icon
if ((null == toneMsg) || (null == toneMsg.text) || (toneMsg.text.equals(""))) {
@@ -116,6 +117,8 @@
if (settings.vibrate && mVibrator != null) {
mVibrator.vibrate(timeout);
}
+
+ alertDialogBuilder.create().show();
}
@Override
