am 001c1dbe: am 0d69454e: am e2550667: (-s ours) am bff09c93: am f7e6aeea: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '001c1dbec2a1d36c52a8db97d147421c319cc2ce':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
old mode 100755
new mode 100644
index 0aee2c4..668a99e
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,6 +23,7 @@
<original-package android:name="com.android.stk" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+ <uses-permission android:name="android.permission.GET_TASKS"/>
<uses-permission android:name="android.permission.RECEIVE_STK_COMMANDS" />
<application android:icon="@drawable/ic_launcher_sim_toolkit"
@@ -30,15 +31,29 @@
android:clearTaskOnLaunch="true"
android:process="com.android.phone"
android:taskAffinity="android.task.stk">
- <activity android:name="StkLauncherActivity"
- android:theme="@android:style/Theme.NoTitleBar"
- android:label="@string/app_name">
+
+ <activity android:name="StkMain"
+ android:theme="@android:style/Theme.NoDisplay"
+ android:label="@string/app_name"
+ android:enabled="false"
+ android:taskAffinity="android.task.stk.StkLauncherActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+ <activity android:name="StkLauncherActivity"
+ android:theme="@android:style/Theme.NoTitleBar"
+ android:label="@string/app_name"
+ android:taskAffinity="android.task.stk.StkLauncherActivity">
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ <action android:name="android.intent.action.PICK" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
<activity android:name="StkMenuActivity"
android:theme="@android:style/Theme.NoTitleBar"
android:icon="@drawable/ic_launcher_sim_toolkit"
@@ -90,13 +105,15 @@
<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= "android.intent.action.LOCALE_CHANGED" />
</intent-filter>
</receiver>
- <receiver android:name="com.android.stk.BootCompletedReceiver"
- androidprv:primaryUserOnly="true">
+ <receiver android:name="com.android.stk.BootCompletedReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
+ <action android:name="android.intent.action.USER_INITIALIZE" />
</intent-filter>
</receiver>
diff --git a/res/layout/stk_msg_dialog.xml b/res/layout/stk_msg_dialog.xml
index 85c28ae..c1c163c 100644
--- a/res/layout/stk_msg_dialog.xml
+++ b/res/layout/stk_msg_dialog.xml
@@ -28,6 +28,7 @@
<ScrollView android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:fillViewport="true"
android:paddingTop="2dip"
android:paddingBottom="12dip"
android:paddingLeft="14dip"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 9d46bc8..02a82b3 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alfabette"</string>
<string name="digits" msgid="1746796679021682388">"Syfers (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Besig met oproep…"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Oproep word tans opgestel"</string>
<string name="stk_app_state" msgid="18582277302584082">"Programtoestand"</string>
<string name="enable_app" msgid="3701224550936728203">"Geaktiveer"</string>
<string name="disable_app" msgid="6725081975611415214">"Gedeaktiveer"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Kanaal gesluit"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"JA"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NEE"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Sit SIM in om SIM-nutsbondel te begin."</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f6f6b1f..f17fead 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"የመተግበሪያ ሁኔታ"</string>
<string name="enable_app" msgid="3701224550936728203">"ነቅቷል"</string>
<string name="disable_app" msgid="6725081975611415214">"ቦዝኗል"</string>
@@ -39,4 +40,5 @@
<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">"የሲም መሥሪያ ስብስብን ለማስጀመር እባክዎ ሲም ያስገቡ።"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 72eb18d..0f66239 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"حالة التطبيق"</string>
<string name="enable_app" msgid="3701224550936728203">"تم التمكين"</string>
<string name="disable_app" msgid="6725081975611415214">"معطّل"</string>
@@ -39,4 +40,5 @@
<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-bg/strings.xml b/res/values-bg/strings.xml
index 36bf467..cc908a9 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"Състояние на приложението"</string>
<string name="enable_app" msgid="3701224550936728203">"Активирано"</string>
<string name="disable_app" msgid="6725081975611415214">"Деактивирано"</string>
@@ -39,4 +40,5 @@
<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 Toolkit."</string>
</resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 7ffe3d1..bdcbafa 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"অ্যাপ্লিকেশান অবস্থা"</string>
<string name="enable_app" msgid="3701224550936728203">"সক্ষম"</string>
<string name="disable_app" msgid="6725081975611415214">"অক্ষম করা হয়েছে"</string>
@@ -39,4 +40,5 @@
<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-ca/strings.xml b/res/values-ca/strings.xml
index cbc650e..3a3f888 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alfabets"</string>
<string name="digits" msgid="1746796679021682388">"Dígits (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Trucada en curs..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"S\'està configurant la trucada."</string>
<string name="stk_app_state" msgid="18582277302584082">"Estat de l\'aplicació"</string>
<string name="enable_app" msgid="3701224550936728203">"Activat"</string>
<string name="disable_app" msgid="6725081975611415214">"Desactivat"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Canal tancat"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"SÍ"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NO"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Insereix la SIM per iniciar SIM Toolkit."</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index de3dcad..b56b819 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Abecedy"</string>
<string name="digits" msgid="1746796679021682388">"Číslice (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Probíhá hovor..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Probíhá nastavení volání"</string>
<string name="stk_app_state" msgid="18582277302584082">"Stav aplikace"</string>
<string name="enable_app" msgid="3701224550936728203">"Povoleno"</string>
<string name="disable_app" msgid="6725081975611415214">"Vypnuto"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Kanál uzavřen"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"ANO"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NE"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Chcete-li spustit Nástroje SIM, vložte SIM kartu."</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b382a2c..a997eaa 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alfabeter"</string>
<string name="digits" msgid="1746796679021682388">"Cifre (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Opkald i gang ..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Opkaldet konfigureres"</string>
<string name="stk_app_state" msgid="18582277302584082">"Programtilstand"</string>
<string name="enable_app" msgid="3701224550936728203">"Aktiveret"</string>
<string name="disable_app" msgid="6725081975611415214">"Deaktiveret"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Kanalen er lukket"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"JA"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NEJ"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Indsæt SIM-kort for at åbne SIM Toolkit."</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ac262f0..da2dc40 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Buchstaben"</string>
<string name="digits" msgid="1746796679021682388">"Ziffern (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Verbindungsaufbau..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Anruf wird eingerichtet"</string>
<string name="stk_app_state" msgid="18582277302584082">"Status der App"</string>
<string name="enable_app" msgid="3701224550936728203">"Aktiviert"</string>
<string name="disable_app" msgid="6725081975611415214">"Deaktiviert"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Kanal geschlossen"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"Ja"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"Nein"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Bitte legen Sie die SIM-Karte ein, um das SIM-Toolkit zu starten."</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 271e140..ac8c4da 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"Κατάσταση εφαρμογής"</string>
<string name="enable_app" msgid="3701224550936728203">"Ενεργοποιημένο"</string>
<string name="disable_app" msgid="6725081975611415214">"Απενεργοποιημένο"</string>
@@ -39,4 +40,5 @@
<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 Toolkit."</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index ab6d509..09f577d 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alphabets"</string>
<string name="digits" msgid="1746796679021682388">"Digits (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Call in progress…"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Call being set up"</string>
<string name="stk_app_state" msgid="18582277302584082">"Application status"</string>
<string name="enable_app" msgid="3701224550936728203">"Enabled"</string>
<string name="disable_app" msgid="6725081975611415214">"Disabled"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Channel Closed"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"YES"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NO"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Please insert SIM to launch SIM Toolkit."</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index ab6d509..09f577d 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alphabets"</string>
<string name="digits" msgid="1746796679021682388">"Digits (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Call in progress…"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Call being set up"</string>
<string name="stk_app_state" msgid="18582277302584082">"Application status"</string>
<string name="enable_app" msgid="3701224550936728203">"Enabled"</string>
<string name="disable_app" msgid="6725081975611415214">"Disabled"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Channel Closed"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"YES"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NO"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Please insert SIM to launch SIM Toolkit."</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f6fae33..ee067c0 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Letras del alfabeto"</string>
<string name="digits" msgid="1746796679021682388">"Dígitos (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Llamada en curso..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Configurando llamada"</string>
<string name="stk_app_state" msgid="18582277302584082">"Estado de la aplicación"</string>
<string name="enable_app" msgid="3701224550936728203">"Activado"</string>
<string name="disable_app" msgid="6725081975611415214">"Desactivado"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Canal cerrado"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"SÍ"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NO"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Inserta la SIM para iniciar el Kit de herramientas de SIM."</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a31464c..c0a6af2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Caracteres alfabéticos"</string>
<string name="digits" msgid="1746796679021682388">"Caracteres numéricos (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Llamada en curso..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Configurando llamada"</string>
<string name="stk_app_state" msgid="18582277302584082">"Estado de la aplicación"</string>
<string name="enable_app" msgid="3701224550936728203">"Habilitado"</string>
<string name="disable_app" msgid="6725081975611415214">"Inhabilitado"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Canal cerrado"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"SÍ"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NO"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Inserta la tarjeta SIM para iniciar el kit de herramientas de SIM."</string>
</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 22b50f4..c88cf8c 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Tähestikud"</string>
<string name="digits" msgid="1746796679021682388">"Numbrid (0–9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Kõne on pooleli ..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Kõnet seadistatakse"</string>
<string name="stk_app_state" msgid="18582277302584082">"Rakenduse olek"</string>
<string name="enable_app" msgid="3701224550936728203">"Lubatud"</string>
<string name="disable_app" msgid="6725081975611415214">"Keelatud"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Kanal suletud"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"JAH"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"EI"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"SIM-kaardi tööriistakomplekti käivitamiseks sisestage SIM-kaart."</string>
</resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 796092b..3828ca1 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Hizkiak"</string>
<string name="digits" msgid="1746796679021682388">"Digituak (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Deia abian da…"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Deia konfiguratzen ari da"</string>
<string name="stk_app_state" msgid="18582277302584082">"Aplikazioaren egoera"</string>
<string name="enable_app" msgid="3701224550936728203">"Gaituta"</string>
<string name="disable_app" msgid="6725081975611415214">"Desgaituta"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Kanala itxita dago"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"BAI"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"EZ"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Sartu SIM txartela SIM tresnak abiarazteko."</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index bef8ddd..17df7fb 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"حالت برنامهٔ کاربردی"</string>
<string name="enable_app" msgid="3701224550936728203">"فعال شد"</string>
<string name="disable_app" msgid="6725081975611415214">"غیرفعال شد"</string>
@@ -39,4 +40,5 @@
<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 Toolkit، لطفاً سیمکارت را وارد کنید."</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d6017ee..13b3590 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Aakkoset"</string>
<string name="digits" msgid="1746796679021682388">"Numerot (0–9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Puhelu kesken..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Puhelua valmistellaan"</string>
<string name="stk_app_state" msgid="18582277302584082">"Sovelluksen tila"</string>
<string name="enable_app" msgid="3701224550936728203">"Käytössä"</string>
<string name="disable_app" msgid="6725081975611415214">"Pois käytöstä"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Suljettu kanava"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"KYLLÄ"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"EI"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Käynnistä SIM Toolkit lisäämällä SIM-kortti."</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 5a2fa8a..461c67b 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alphabets"</string>
<string name="digits" msgid="1746796679021682388">"Chiffres (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Appel en cours"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Appel en cours de configuration"</string>
<string name="stk_app_state" msgid="18582277302584082">"État de l\'application"</string>
<string name="enable_app" msgid="3701224550936728203">"Activé"</string>
<string name="disable_app" msgid="6725081975611415214">"Désactivé"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Canal fermé"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"OUI"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NON"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Veuillez insérer une carte SIM pour lancer SIM Toolkit."</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9f33b1c..6d08f78 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alphabets"</string>
<string name="digits" msgid="1746796679021682388">"Chiffres (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Appel en cours..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Appel en cours de configuration…"</string>
<string name="stk_app_state" msgid="18582277302584082">"État de l\'application"</string>
<string name="enable_app" msgid="3701224550936728203">"Activé"</string>
<string name="disable_app" msgid="6725081975611415214">"Désactivé"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Canal fermé"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"OUI"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NON"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Veuillez insérer la carte SIM pour lancer le kit SIM."</string>
</resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index aa23da5..02149c4 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alfabetos"</string>
<string name="digits" msgid="1746796679021682388">"Díxitos (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Chamada en curso…"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Chamada en curso"</string>
<string name="stk_app_state" msgid="18582277302584082">"Estado da aplicación"</string>
<string name="enable_app" msgid="3701224550936728203">"Activado"</string>
<string name="disable_app" msgid="6725081975611415214">"Desactivada"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Pechouse a canle"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"SI"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NON"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Insire a SIM para iniciar SIM Toolkit."</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index cbefa58..accb74d 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -23,12 +23,13 @@
<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>
<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>
@@ -39,4 +40,5 @@
<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">"सिम टूलकिट लॉन्च करने के लिए कृपया सिम डालें."</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 80783db..6802bf1 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Abecede"</string>
<string name="digits" msgid="1746796679021682388">"Znamenke (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Razgovor u tijeku…"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Poziv se postavlja"</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>
@@ -39,4 +40,5 @@
<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">"Umetnite SIM da biste pokrenuli alat za SIM."</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 483ef55..92a504a 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"ABC"</string>
<string name="digits" msgid="1746796679021682388">"Számok (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Hívás folyamatban..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Hívás beállítása…"</string>
<string name="stk_app_state" msgid="18582277302584082">"Alkalmazás állapota"</string>
<string name="enable_app" msgid="3701224550936728203">"Engedélyezve"</string>
<string name="disable_app" msgid="6725081975611415214">"Letiltva"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"A csatorna zárva van."</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"IGEN"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NEM"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"A SIM-eszköztár indításához helyezzen be egy SIM kártyát."</string>
</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 04716ea..9e532f7 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"Ծրագրի կարգավիճակը"</string>
<string name="enable_app" msgid="3701224550936728203">"Միացված է"</string>
<string name="disable_app" msgid="6725081975611415214">"Անջատված է"</string>
@@ -39,4 +40,5 @@
<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 Toolkit-ը գործարկելու համար:"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 59c4d45..bd0c1e1 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alfabet"</string>
<string name="digits" msgid="1746796679021682388">"Digit (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Panggilan sedang berlangsung..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Panggilan yang sedang disiapkan"</string>
<string name="stk_app_state" msgid="18582277302584082">"Status aplikasi"</string>
<string name="enable_app" msgid="3701224550936728203">"Diaktifkan"</string>
<string name="disable_app" msgid="6725081975611415214">"Dinonaktifkan"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Saluran Ditutup"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"YA"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"TIDAK"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Masukkan SIM untuk meluncurkan Perangkat SIM."</string>
</resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 49a495d..6e35ca5 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Stafróf"</string>
<string name="digits" msgid="1746796679021682388">"Tölustafir (0–9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Símtal í gangi…"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Verið er að setja upp símtal"</string>
<string name="stk_app_state" msgid="18582277302584082">"Staða forrits"</string>
<string name="enable_app" msgid="3701224550936728203">"Virkt"</string>
<string name="disable_app" msgid="6725081975611415214">"Óvirkt"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Rás lokað"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"JÁ"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NEI"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Settu SIM-kort í til að ræsa SIM-verkfæri."</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d378565..ef94ae5 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Caratteri alfabetici"</string>
<string name="digits" msgid="1746796679021682388">"Cifre (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Chiamata in corso..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Impostazione della chiamata in corso"</string>
<string name="stk_app_state" msgid="18582277302584082">"Stato applicazione"</string>
<string name="enable_app" msgid="3701224550936728203">"Attivato"</string>
<string name="disable_app" msgid="6725081975611415214">"Disattivato"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Canale chiuso"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"SÌ"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NO"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Inserisci la SIM per avviare Kit strumenti SIM."</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 080a873..a763ee1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"מצב אפליקציה"</string>
<string name="enable_app" msgid="3701224550936728203">"מופעל"</string>
<string name="disable_app" msgid="6725081975611415214">"מושבת"</string>
@@ -39,4 +40,5 @@
<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 כדי להפעיל את Toolkit SIM."</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index dbb50ff..b74d59a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"アプリケーションの状態"</string>
<string name="enable_app" msgid="3701224550936728203">"有効"</string>
<string name="disable_app" msgid="6725081975611415214">"無効"</string>
@@ -39,4 +40,5 @@
<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 Toolkitを起動してください。"</string>
</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 472b563..5127716 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"აპლიკაციის მდგომარეობა"</string>
<string name="enable_app" msgid="3701224550936728203">"გააქტიურებული"</string>
<string name="disable_app" msgid="6725081975611415214">"გამორთულია"</string>
@@ -39,4 +40,5 @@
<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 Toolkit-ის გასაშვებად."</string>
</resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index c2f5d60..33f85b1 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"Қолданба күйі"</string>
<string name="enable_app" msgid="3701224550936728203">"Қосылған"</string>
<string name="disable_app" msgid="6725081975611415214">"Өшірілген"</string>
@@ -39,4 +40,5 @@
<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-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 3039cab..bf2abbf 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -22,13 +22,14 @@
<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_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>
@@ -39,4 +40,5 @@
<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">"សូមបញ្ចូលស៊ីមដើម្បីចាប់ផ្តើមដំណើរការប្រអប់ឧបករណ៍ស៊ីម។"</string>
</resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index bb51d61..25f760b 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/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>
@@ -29,14 +29,16 @@
<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="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">"ಸಿಮ್ ಟೂಲ್ಕಿಟ್ ಅನ್ನು ಪ್ರಾರಂಭಿಸಲು ದಯವಿಟ್ಟು ಸಿಮ್ ಸೇರ್ಪಡಿಸಿ."</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 59e1e67..d777e48 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"애플리케이션 상태"</string>
<string name="enable_app" msgid="3701224550936728203">"사용"</string>
<string name="disable_app" msgid="6725081975611415214">"사용 안함"</string>
@@ -39,4 +40,5 @@
<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-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 7b7ebac..95acccf 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"Колдонмонун абалы"</string>
<string name="enable_app" msgid="3701224550936728203">"Иштетилген"</string>
<string name="disable_app" msgid="6725081975611415214">"Токтотулган"</string>
@@ -39,4 +40,5 @@
<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-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 3777893..69a0d05 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"ສະຖານະແອັບພລິເຄຊັນ"</string>
<string name="enable_app" msgid="3701224550936728203">"ເປິດນຳໃຊ້"</string>
<string name="disable_app" msgid="6725081975611415214">"ປິດນຳໃຊ້ແລ້ວ"</string>
@@ -39,4 +40,5 @@
<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-lt/strings.xml b/res/values-lt/strings.xml
index 5786596..9e04a46 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Abėcėlės"</string>
<string name="digits" msgid="1746796679021682388">"Skaitmenys (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Skambutis vykdomas..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Skambutis nustatomas"</string>
<string name="stk_app_state" msgid="18582277302584082">"Programos būsena"</string>
<string name="enable_app" msgid="3701224550936728203">"Įgalinta"</string>
<string name="disable_app" msgid="6725081975611415214">"Išjungta"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Kanalas uždarytas"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"TAIP"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NE"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Įdėkite SIM, kad paleistumėte SIM įrankių komplektą."</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 233d220..6ea916b 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alfabēti"</string>
<string name="digits" msgid="1746796679021682388">"Cipari (0–9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Notiek zvanīšana..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Notiek zvana izveide"</string>
<string name="stk_app_state" msgid="18582277302584082">"Lietojumprogrammas stāvoklis"</string>
<string name="enable_app" msgid="3701224550936728203">"Iespējots"</string>
<string name="disable_app" msgid="6725081975611415214">"Atspējots"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Kanāls ir aizvērts."</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"JĀ"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NĒ"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Lūdzu, ievietojiet SIM karti, lai palaistu SIM rīkkopu."</string>
</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index a3212ac..328236b 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"Состојба на апликација"</string>
<string name="enable_app" msgid="3701224550936728203">"Овозможено"</string>
<string name="disable_app" msgid="6725081975611415214">"Оневозможено"</string>
@@ -39,4 +40,5 @@
<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">"Вметнете СИМ за да го активирате Алатникот на СИМ."</string>
</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 66a142f..be70469 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/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 Toolkit"</string>
+ <string name="app_name" msgid="8396461461738434341">"സിം Toolkit"</string>
<string name="menu_end_session" msgid="7368541737750982217">"സെഷൻ അവസാനിച്ചു"</string>
<string name="help" msgid="9209980881219397319">"സഹായം"</string>
<string name="menu_back" msgid="301227740977453364">"മടങ്ങുക"</string>
@@ -29,14 +29,16 @@
<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 ToolKit"</string>
+ <string name="stk_dialog_title" msgid="6954825385456886726">"സിം 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_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-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 687eecd..fa58f0e 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"Аппликешны байдал"</string>
<string name="enable_app" msgid="3701224550936728203">"Идэвхжүүлсэн"</string>
<string name="disable_app" msgid="6725081975611415214">"Идэвхгүйжүүлсэн"</string>
@@ -39,4 +40,5 @@
<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 Toolkit-ийг ажиллуулахын тулд SIM-ээ оруулах уу."</string>
</resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 9ed7dc9..00e5870 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"अनुप्रयोग स्थिती"</string>
<string name="enable_app" msgid="3701224550936728203">"सक्षम केले"</string>
<string name="disable_app" msgid="6725081975611415214">"अक्षम केले"</string>
@@ -39,4 +40,5 @@
<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">"कृपया सिम टूलकिट लाँच करण्यासाठी सिम घाला."</string>
</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 9a3482e..0f14a6c 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Abjad"</string>
<string name="digits" msgid="1746796679021682388">"Digit (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Panggilan sedang berlangsung..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Panggilan sedang disediakan"</string>
<string name="stk_app_state" msgid="18582277302584082">"Keadaan aplikasi"</string>
<string name="enable_app" msgid="3701224550936728203">"Didayakan"</string>
<string name="disable_app" msgid="6725081975611415214">"Dilumpuhkan"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Saluran Ditutup"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"YA"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"TIDAK"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Sila sisipkan SIM untuk melancarkan Set Alat SIM."</string>
</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index b484c85..69eb11f 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -23,20 +23,22 @@
<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>
<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_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">"YES"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NO"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"SIM တူးလ်ကစ်အား စတင်ရန် SIM ကိုကျေးဇူးပြု၍ ထည့်သွင်းပါ။"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index ef55277..b1c9dbc 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alfabeter"</string>
<string name="digits" msgid="1746796679021682388">"Siffer (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Anrop underveis…"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Samtalen settes opp"</string>
<string name="stk_app_state" msgid="18582277302584082">"Applikasjonstilstand"</string>
<string name="enable_app" msgid="3701224550936728203">"Aktivert"</string>
<string name="disable_app" msgid="6725081975611415214">"Deaktivert"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Kanalen er stengt"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"JA"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NO"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Sett inn SIM-kortet for å starte SIM Toolkit."</string>
</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index e466ebe..2f42cd4 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"अक्षरहरू"</string>
<string name="digits" msgid="1746796679021682388">"अंकहरू (०-९, *, # +)"</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>
@@ -39,4 +40,5 @@
<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-nl/strings.xml b/res/values-nl/strings.xml
index b3c8cc4..ee095bd 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alfabetten"</string>
<string name="digits" msgid="1746796679021682388">"Symbolen (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Actieve oproep..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Aanroep wordt ingesteld"</string>
<string name="stk_app_state" msgid="18582277302584082">"Toepassingsstatus"</string>
<string name="enable_app" msgid="3701224550936728203">"Ingeschakeld"</string>
<string name="disable_app" msgid="6725081975611415214">"Uitgeschakeld"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Kanaal gesloten"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"JA"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NEE"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Plaats een simkaart om de SIM Toolkit te starten."</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1552086..5cb4a2c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Znaki alfanumeryczne"</string>
<string name="digits" msgid="1746796679021682388">"Cyfry (0–9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Połączenie w toku..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Trwa konfigurowanie połączenia"</string>
<string name="stk_app_state" msgid="18582277302584082">"Stan aplikacji"</string>
<string name="enable_app" msgid="3701224550936728203">"Włączone"</string>
<string name="disable_app" msgid="6725081975611415214">"Wyłączone"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Kanał zamknięty"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"TAK"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NIE"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Włóż kartę SIM, aby uruchomić Zestaw narzędzi SIM."</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 1c5e6b9..9801d72 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alfabetos"</string>
<string name="digits" msgid="1746796679021682388">"Dígitos (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Chamada em curso..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"A chamada está a ser configurada"</string>
<string name="stk_app_state" msgid="18582277302584082">"Estado da aplicação"</string>
<string name="enable_app" msgid="3701224550936728203">"Ativado"</string>
<string name="disable_app" msgid="6725081975611415214">"Desativado"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Canal Fechado"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"SIM"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NÃO"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Insira o SIM para iniciar o SIM Toolkit."</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d935b35..0cc5296 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -29,7 +29,8 @@
<string name="alphabet" msgid="1583185545938805861">"Alfabeto"</string>
<string name="digits" msgid="1746796679021682388">"Dígitos (0 a 9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Chamada em andamento..."</string>
- <string name="stk_app_state" msgid="18582277302584082">"Estado do aplicativo"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Chamada sendo configurada"</string>
+ <string name="stk_app_state" msgid="18582277302584082">"Estado do app"</string>
<string name="enable_app" msgid="3701224550936728203">"Ativado"</string>
<string name="disable_app" msgid="6725081975611415214">"Desativado"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Toolkit do SIM"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Canal fechado"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"SIM"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NÃO"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Insira o cartão SIM para iniciar a Barra de ferramentas SIM."</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index e18e17c..335c3b4 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alfabete"</string>
<string name="digits" msgid="1746796679021682388">"Cifre (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Se apelează..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Se configurează apelul"</string>
<string name="stk_app_state" msgid="18582277302584082">"Starea aplicaţiei"</string>
<string name="enable_app" msgid="3701224550936728203">"Activat"</string>
<string name="disable_app" msgid="6725081975611415214">"Dezactivat"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Canal închis"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"DA"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NU"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Introduceți cardul SIM ca să lansați setul de instrumente pentru SIM."</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2bacc48..8a791b3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"Состояние приложения"</string>
<string name="enable_app" msgid="3701224550936728203">"Включено"</string>
<string name="disable_app" msgid="6725081975611415214">"Отключено"</string>
@@ -39,4 +40,5 @@
<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-карту."</string>
</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index f3b2898..64330ef 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"යෙදුම් අවස්ථාව"</string>
<string name="enable_app" msgid="3701224550936728203">"සබලයි"</string>
<string name="disable_app" msgid="6725081975611415214">"අබලයි"</string>
@@ -39,4 +40,5 @@
<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 පත ඇතුළත් කරන්න."</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 79e4d39..7975f84 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Abecedy"</string>
<string name="digits" msgid="1746796679021682388">"Číslice (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Prebieha hovor..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Hovor sa nastavuje"</string>
<string name="stk_app_state" msgid="18582277302584082">"Stav aplikácie"</string>
<string name="enable_app" msgid="3701224550936728203">"Povolené"</string>
<string name="disable_app" msgid="6725081975611415214">"Zakázané"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Kanál bol uzavretý"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"ÁNO"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NIE"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Spustite Nástroje SIM vložením SIM karty."</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index ced0b89..13f4df3 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -29,7 +29,8 @@
<string name="alphabet" msgid="1583185545938805861">"Pisave"</string>
<string name="digits" msgid="1746796679021682388">"Številke (0–9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Klic poteka …"</string>
- <string name="stk_app_state" msgid="18582277302584082">"Stanje programa"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Klic se vzpostavlja"</string>
+ <string name="stk_app_state" msgid="18582277302584082">"Stanje aplikacije"</string>
<string name="enable_app" msgid="3701224550936728203">"Omogočeno"</string>
<string name="disable_app" msgid="6725081975611415214">"Onemogočeno"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Orodja za SIM"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Kanal je zaprt"</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">"Vstavite kartico SIM, da zaženete orodja za SIM."</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 8493e05..c9fea5c 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"Стање апликације"</string>
<string name="enable_app" msgid="3701224550936728203">"Омогућено"</string>
<string name="disable_app" msgid="6725081975611415214">"Онемогућено"</string>
@@ -39,4 +40,5 @@
<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-sv/strings.xml b/res/values-sv/strings.xml
index 3db611c..90a31e3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Bokstäver"</string>
<string name="digits" msgid="1746796679021682388">"Siffror (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Samtal pågår..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Samtal konfigureras"</string>
<string name="stk_app_state" msgid="18582277302584082">"Programstatus"</string>
<string name="enable_app" msgid="3701224550936728203">"Har aktiverats"</string>
<string name="disable_app" msgid="6725081975611415214">"Har inaktiverats"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Stängd kanal"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"JA"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"NEJ"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Sätt i SIM-kortet om du vill starta SIM Toolkit."</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index f5c93b7..d0ddf43 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alfabeti"</string>
<string name="digits" msgid="1746796679021682388">"Tarakimu (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Upigaji simu unaendelea..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Simu inapigwa"</string>
<string name="stk_app_state" msgid="18582277302584082">"Hali ya programu"</string>
<string name="enable_app" msgid="3701224550936728203">"Imewezeshwa"</string>
<string name="disable_app" msgid="6725081975611415214">"Imelemazwa"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Kituo Kimefungwa"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"NDIYO"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"HAPANA"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Tafadhali weka SIM ili ufungue Zana za SIM."</string>
</resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index bc5d4b8..316d1df 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/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>
@@ -29,14 +29,16 @@
<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="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">"சிம் கருவித்தொகுப்பைத் துவக்க, சிம்மைச் செருகவும்."</string>
</resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 49e9d6b..6fdfe08 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/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>
@@ -29,14 +29,16 @@
<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="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>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 4a3de1f..478bdfa 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -29,9 +29,10 @@
<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="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>
@@ -39,4 +40,5 @@
<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 Toolkit"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 21276cf..fcd711a 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Mga Alphabet"</string>
<string name="digits" msgid="1746796679021682388">"Mga Digit (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"May nagaganap na tawag…"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Sine-setup ang tawag"</string>
<string name="stk_app_state" msgid="18582277302584082">"Katayuan ng application"</string>
<string name="enable_app" msgid="3701224550936728203">"Pinagana"</string>
<string name="disable_app" msgid="6725081975611415214">"Hindi pinagana"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Nakasara ang Channel"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"OO"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"HINDI"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Pakipasok ang SIM upang ilunsad ang SIM Toolkit."</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 92e32b0..6088c43 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alfabe karakterleri"</string>
<string name="digits" msgid="1746796679021682388">"Rakamlar (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Çağrı sürüyor…"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Çağrı oluşturuluyor"</string>
<string name="stk_app_state" msgid="18582277302584082">"Uygulama durumu"</string>
<string name="enable_app" msgid="3701224550936728203">"Etkin"</string>
<string name="disable_app" msgid="6725081975611415214">"Devre dışı"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Kanal Kapalı"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"EVET"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"HAYIR"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"SIM Araç Seti\'ni başlatmak için lütfen SIM takın."</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 98d3f3f..f7455f3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"Стан програми"</string>
<string name="enable_app" msgid="3701224550936728203">"Увімкнено"</string>
<string name="disable_app" msgid="6725081975611415214">"Вимкнено"</string>
@@ -39,4 +40,5 @@
<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 Toolkit."</string>
</resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 1c3512b..3356542 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"ایپلیکیشن کی حیثیت"</string>
<string name="enable_app" msgid="3701224550936728203">"فعال"</string>
<string name="disable_app" msgid="6725081975611415214">"غیر فعال"</string>
@@ -39,4 +40,5 @@
<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-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 01d6754..5add38d 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Alifbo"</string>
<string name="digits" msgid="1746796679021682388">"(0-9, *, #, +) raqamlari"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Qo‘ng‘iroq amalda…"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Qo‘ng‘iroq sozlanmoqda"</string>
<string name="stk_app_state" msgid="18582277302584082">"Ilova holati"</string>
<string name="enable_app" msgid="3701224550936728203">"Yoqilgan"</string>
<string name="disable_app" msgid="6725081975611415214">"O‘chirilgan"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Kanal yopilgan"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"Ha"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"Yo‘q"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"SIM karta menyusini ochish uchun SIM kartani soling."</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 862b9fa..3f3ebaf 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Bảng chữ cái"</string>
<string name="digits" msgid="1746796679021682388">"Chữ số (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Cuộc gọi đang diễn ra…"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Cuộc gọi đang được thiết lập"</string>
<string name="stk_app_state" msgid="18582277302584082">"Trạng thái ứng dụng"</string>
<string name="enable_app" msgid="3701224550936728203">"Đã bật"</string>
<string name="disable_app" msgid="6725081975611415214">"Đã vô hiệu hóa"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Đã đóng kênh"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"CÓ"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"KHÔNG"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Vui lòng lắp SIM để chạy Bộ công cụ SIM."</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 84e6770..b765f57 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"应用状态"</string>
<string name="enable_app" msgid="3701224550936728203">"已启用"</string>
<string name="disable_app" msgid="6725081975611415214">"已停用"</string>
@@ -39,4 +40,5 @@
<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-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 2e81e7f..f949087 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"應用程式狀態"</string>
<string name="enable_app" msgid="3701224550936728203">"已啟用"</string>
<string name="disable_app" msgid="6725081975611415214">"已停用"</string>
@@ -39,4 +40,5 @@
<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-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 943d72b..eb0d1c9 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -29,6 +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="stk_app_state" msgid="18582277302584082">"應用程式狀態"</string>
<string name="enable_app" msgid="3701224550936728203">"已啟用"</string>
<string name="disable_app" msgid="6725081975611415214">"已停用"</string>
@@ -39,4 +40,5 @@
<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-zu/strings.xml b/res/values-zu/strings.xml
index 6aa54e0..792299e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -29,6 +29,7 @@
<string name="alphabet" msgid="1583185545938805861">"Amagama"</string>
<string name="digits" msgid="1746796679021682388">"Izinombolo (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Ikholi iyaqhubeka..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Ikholi iyasethwa"</string>
<string name="stk_app_state" msgid="18582277302584082">"Isimo sohlelo lokusebenza"</string>
<string name="enable_app" msgid="3701224550936728203">"Kuvunyelwe"</string>
<string name="disable_app" msgid="6725081975611415214">"Khutshaziwe"</string>
@@ -39,4 +40,5 @@
<string name="default_close_channel_msg" msgid="765364262263839824">"Isiteshi Sivaliwe"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"YEBO"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"CHA"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Sicela ufake i-SIM ukuze uqalise ikhithi yamathuluzi we-SIM."</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bf26d73..ea50e85 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -41,6 +41,8 @@
<string name="digits">Digits (0-9, *, #, +)</string>
<!-- Default transition message when launching a call -->
<string name="default_call_setup_msg">Call in progress\u2026</string>
+ <!-- Default message for SET_UP_CALL when there is no ALPHA tag in it -->
+ <string name="default_setup_call_msg">Call being setup</string>
<string name="stk_app_state">Application state</string>
<string name="enable_app">Enabled</string>
@@ -59,4 +61,5 @@
<!-- Button texts used in STK dialog -->
<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>
</resources>
diff --git a/src/com/android/stk/BootCompletedReceiver.java b/src/com/android/stk/BootCompletedReceiver.java
index f11c4f3..ff46a50 100644
--- a/src/com/android/stk/BootCompletedReceiver.java
+++ b/src/com/android/stk/BootCompletedReceiver.java
@@ -19,7 +19,9 @@
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.os.Bundle;
+
import com.android.internal.telephony.cat.CatLog;
/**
@@ -41,6 +43,14 @@
context.startService(new Intent(context, StkAppService.class)
.putExtras(args));
CatLog.d(LOG_TAG, "[ACTION_BOOT_COMPLETED]");
+ } else if(action.equals(Intent.ACTION_USER_INITIALIZE)) {
+ if (!android.os.Process.myUserHandle().isOwner()) {
+ //Disable package for all secondary users. Package is only required for device
+ //owner.
+ context.getPackageManager().setApplicationEnabledSetting(context.getPackageName(),
+ PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0);
+ return;
+ }
}
}
}
diff --git a/src/com/android/stk/StkAppInstaller.java b/src/com/android/stk/StkAppInstaller.java
index 3208ba8..2d06e59 100644
--- a/src/com/android/stk/StkAppInstaller.java
+++ b/src/com/android/stk/StkAppInstaller.java
@@ -31,7 +31,7 @@
*
*/
abstract class StkAppInstaller {
- private static final String STK_LAUNCHER_ACTIVITY = "com.android.stk.StkLauncherActivity";
+ private static final String STK_MAIN_ACTIVITY = "com.android.stk.StkMain";
private static final String LOG_TAG = "StkAppInstaller";
private StkAppInstaller() {
@@ -57,7 +57,7 @@
CatLog.d(LOG_TAG, "[setAppState]- no package manager, just return.");
return;
}
- ComponentName cName = new ComponentName("com.android.stk", STK_LAUNCHER_ACTIVITY);
+ ComponentName cName = new ComponentName("com.android.stk", STK_MAIN_ACTIVITY);
int state = install ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
: PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
old mode 100755
new mode 100644
index 1220741..1714d6d
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -16,6 +16,8 @@
package com.android.stk;
+import android.app.ActivityManager;
+import android.app.ActivityManager.RunningTaskInfo;
import android.app.AlertDialog;
import android.app.Notification;
import android.app.NotificationManager;
@@ -28,6 +30,7 @@
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;
@@ -36,6 +39,8 @@
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
+import android.os.PowerManager;
+import android.provider.Settings;
import android.telephony.TelephonyManager;
import android.view.Gravity;
import android.view.LayoutInflater;
@@ -52,12 +57,14 @@
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;
+import com.android.internal.telephony.cat.CatCmdMessage.SetupEventListSettings;
import com.android.internal.telephony.cat.CatLog;
import com.android.internal.telephony.cat.CatResponseMessage;
import com.android.internal.telephony.cat.TextMessage;
@@ -67,11 +74,18 @@
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;
import java.util.LinkedList;
import java.lang.System;
import java.util.List;
+import static com.android.internal.telephony.cat.CatCmdMessage.
+ SetupEventListConstants.IDLE_SCREEN_AVAILABLE_EVENT;
+import static com.android.internal.telephony.cat.CatCmdMessage.
+ SetupEventListConstants.LANGUAGE_SELECTION_EVENT;
+
/**
* SIM toolkit application level service. Interacts with Telephopny messages,
* application's launch and user input from STK UI elements.
@@ -102,8 +116,12 @@
private Activity mActivityInstance = null;
private Activity mDialogInstance = null;
private Activity mMainActivityInstance = null;
- private boolean mBackGroundTRSent = false;
private int mSlotId = 0;
+ private SetupEventListSettings mSetupEventListSettings = null;
+ private boolean mClearSelectItem = false;
+ private boolean mDisplayTextDlgIsVisibile = false;
+ private CatCmdMessage mCurrentSetupEventCmd = null;
+ private CatCmdMessage mIdleModeTextCmd = null;
final synchronized void setPendingActivityInstance(Activity act) {
CatLog.d(this, "setPendingActivityInstance act : " + mSlotId + ", " + act);
callSetActivityInstMsg(OP_SET_ACT_INST, mSlotId, act);
@@ -141,6 +159,9 @@
private AppInterface[] mStkService = null;
private StkContext[] mStkContext = null;
private int mSimCount = 0;
+ private PowerManager mPowerManager = null;
+ private StkCmdReceiver mStkCmdReceiver = null;
+
// Used for setting FLAG_ACTIVITY_NO_USER_ACTION when
// creating an intent.
private enum InitiatedByUserAction {
@@ -163,6 +184,11 @@
static final String STK_MENU_URI = "stk://com.android.stk/menu/";
static final String STK_INPUT_URI = "stk://com.android.stk/input/";
static final String STK_TONE_URI = "stk://com.android.stk/tone/";
+
+ // These below constants are used for SETUP_EVENT_LIST
+ static final String SETUP_EVENT_TYPE = "event";
+ static final String SETUP_EVENT_CAUSE = "cause";
+
// operations ids for different service functionality.
static final int OP_CMD = 1;
static final int OP_RESPONSE = 2;
@@ -174,6 +200,12 @@
static final int OP_SET_ACT_INST = 8;
static final int OP_SET_DAL_INST = 9;
static final int OP_SET_MAINACT_INST = 10;
+ static final int OP_LOCALE_CHANGED = 11;
+ static final int OP_ALPHA_NOTIFY = 12;
+ static final int OP_IDLE_SCREEN = 13;
+
+ //Invalid SetupEvent
+ static final int INVALID_SETUP_EVENT = 0xFF;
// Response ids
static final int RES_ID_MENU_SELECTION = 11;
@@ -227,15 +259,12 @@
CatLog.d(LOG_TAG, "simCount: " + mSimCount);
mStkService = new AppInterface[mSimCount];
mStkContext = new StkContext[mSimCount];
+ mPowerManager = (PowerManager)getSystemService(Context.POWER_SERVICE);
+ mStkCmdReceiver = new StkCmdReceiver();
+ registerReceiver(mStkCmdReceiver, new IntentFilter(Intent.ACTION_SCREEN_OFF));
for (i = 0; i < mSimCount; i++) {
CatLog.d(LOG_TAG, "slotId: " + i);
- if (null != UiccController.getInstance() && null != UiccController.getInstance()
- .getUiccCard(i)) {
- mStkService[i] = UiccController.getInstance().getUiccCard(i).getCatService();
- } else {
- CatLog.d(LOG_TAG, "Null instance: [" + UiccController.getInstance() + "],[" +
- UiccController.getInstance().getUiccCard(i) + "]");
- }
+ mStkService[i] = CatService.getInstance(i);
mStkContext[i] = new StkContext();
mStkContext[i].mSlotId = i;
mStkContext[i].mCmdsQ = new LinkedList<DelayedCmd>();
@@ -269,14 +298,7 @@
}
CatLog.d(LOG_TAG, "onStart sim id: " + slotId + ", op: " + op + ", " + args);
if ((slotId >= 0 && slotId < mSimCount) && mStkService[slotId] == null) {
- if (null != UiccController.getInstance() && null != UiccController.getInstance()
- .getUiccCard(slotId)) {
- mStkService[slotId] = UiccController.getInstance().getUiccCard(slotId)
- .getCatService();
- } else {
- CatLog.d(LOG_TAG, "Null instance: [" + UiccController.getInstance() + "],[" +
- UiccController.getInstance().getUiccCard(slotId)+"]");
- }
+ mStkService[slotId] = CatService.getInstance(slotId);
if (mStkService[slotId] == null) {
CatLog.d(LOG_TAG, "mStkService is: " + mStkContext[slotId].mStkServiceState);
mStkContext[slotId].mStkServiceState = STATE_NOT_EXIST;
@@ -300,11 +322,6 @@
}
waitForLooper();
- // onStart() method can be passed a null intent
- // TODO: replace onStart() with onStartCommand()
- if (intent == null) {
- return;
- }
Message msg = mServiceHandler.obtainMessage();
msg.arg1 = op;
@@ -315,6 +332,9 @@
break;
case OP_RESPONSE:
case OP_CARD_STATUS_CHANGED:
+ case OP_LOCALE_CHANGED:
+ case OP_ALPHA_NOTIFY:
+ case OP_IDLE_SCREEN:
msg.obj = args;
/* falls through */
case OP_LAUNCH_APP:
@@ -330,6 +350,11 @@
@Override
public void onDestroy() {
CatLog.d(LOG_TAG, "onDestroy()");
+ if (mStkCmdReceiver != null) {
+ unregisterReceiver(mStkCmdReceiver);
+ mStkCmdReceiver = null;
+ }
+ mPowerManager = null;
waitForLooper();
mServiceLooper.quit();
}
@@ -357,6 +382,15 @@
}
}
+ /*
+ * Package api used by StkDialogActivity to indicate if its on the foreground.
+ */
+ void setDisplayTextDlgVisibility(boolean visibility, int slotId) {
+ if (slotId >= 0 && slotId < mSimCount) {
+ mStkContext[slotId].mDisplayTextDlgIsVisibile = visibility;
+ }
+ }
+
boolean isInputPending(int slotId) {
if (slotId >= 0 && slotId < mSimCount) {
CatLog.d(LOG_TAG, "isInputFinishBySrv: " + mStkContext[slotId].mIsInputPending);
@@ -398,7 +432,7 @@
*/
Menu getMainMenu(int slotId) {
CatLog.d(LOG_TAG, "StkAppService, getMainMenu, sim id: " + slotId);
- if (slotId >=0 && slotId < mSimCount) {
+ if (slotId >=0 && slotId < mSimCount && (mStkContext[slotId].mMainCmd != null)) {
return mStkContext[slotId].mMainCmd.getMenu();
} else {
return null;
@@ -454,35 +488,6 @@
//just finish it and create a new one to handle the pending command.
cleanUpInstanceStackBySlot(slotId);
- //Clean up all other activities in stack.
- for (int i = 0; i < mSimCount; i++) {
- if (i != slotId && mStkContext[i].mCurrentCmd != null) {
- Activity otherAct = mStkContext[i].getPendingActivityInstance();
- Activity otherDal = mStkContext[i].getPendingDialogInstance();
- Activity otherMainMenu = mStkContext[i].getMainActivityInstance();
- if (otherAct != null) {
- CatLog.d(LOG_TAG, "finish pending otherAct and send SE. slot: " + i);
- // Send end session for the pending proactive command of slot i in
- // onDestroy of the activity.
- // Set mBackGroundTRSent to true for ignoring to show the main menu
- // for the following end session event.
- mStkContext[i].mBackGroundTRSent = true;
- otherAct.finish();
- mStkContext[i].mActivityInstance = null;
- }
- if (otherDal != null) {
- CatLog.d(LOG_TAG, "finish pending otherDal and send TR for the dialog");
- mStkContext[i].mBackGroundTRSent = true;
- otherDal.finish();
- mStkContext[i].mDialogInstance = null;
- }
- if (otherMainMenu != null) {
- CatLog.d(LOG_TAG, "finish pending otherMainMenu.");
- otherMainMenu.finish();
- mStkContext[i].mMainActivityInstance = null;
- }
- }
- }
CatLog.d(LOG_TAG, "Current cmd type: " +
mStkContext[slotId].mCurrentCmd.getCmdType());
//Restore the last command from stack by slot id.
@@ -513,17 +518,13 @@
}
break;
case OP_RESPONSE:
- if (mStkContext[slotId].responseNeeded) {
- handleCmdResponse((Bundle) msg.obj, slotId);
- }
+ handleCmdResponse((Bundle) msg.obj, slotId);
// call delayed commands if needed.
if (mStkContext[slotId].mCmdsQ.size() != 0) {
callDelayedMsg(slotId);
} else {
mStkContext[slotId].mCmdInProgress = false;
}
- // reset response needed state var to its original value.
- mStkContext[slotId].responseNeeded = true;
break;
case OP_END_SESSION:
if (!mStkContext[slotId].mCmdInProgress) {
@@ -571,6 +572,20 @@
CatLog.d(LOG_TAG, "Set activity instance. " + mainAct);
mStkContext[slotId].mMainActivityInstance = mainAct;
break;
+ case OP_LOCALE_CHANGED:
+ CatLog.d(this, "Locale Changed");
+ checkForSetupEvent(LANGUAGE_SELECTION_EVENT,(Bundle) msg.obj, slotId);
+ break;
+ case OP_ALPHA_NOTIFY:
+ handleAlphaNotify((Bundle) msg.obj);
+ break;
+ case OP_IDLE_SCREEN:
+ for (int slot = 0; slot < mSimCount; slot++) {
+ if (mStkContext[slot] != null) {
+ handleIdleScreen(slot);
+ }
+ }
+ break;
}
}
@@ -628,6 +643,53 @@
return false;
}
}
+
+ /*
+ * If the device is not in an interactive state, we can assume
+ * that the screen is idle.
+ */
+ private boolean isScreenIdle() {
+ return (!mPowerManager.isInteractive());
+ }
+
+ private void handleIdleScreen(int slotId) {
+
+ // If the idle screen event is present in the list need to send the
+ // response to SIM.
+ CatLog.d(this, "Need to send IDLE SCREEN Available event to SIM");
+ checkForSetupEvent(IDLE_SCREEN_AVAILABLE_EVENT, null, slotId);
+
+ if (mStkContext[slotId].mIdleModeTextCmd != null) {
+ launchIdleText(slotId);
+ }
+ }
+
+ private void sendScreenBusyResponse(int slotId) {
+ if (mStkContext[slotId].mCurrentCmd == null) {
+ return;
+ }
+ CatResponseMessage resMsg = new CatResponseMessage(mStkContext[slotId].mCurrentCmd);
+ CatLog.d(this, "SCREEN_BUSY");
+ resMsg.setResultCode(ResultCode.TERMINAL_CRNTLY_UNABLE_TO_PROCESS);
+ mStkService[slotId].onCmdResponse(resMsg);
+ if (mStkContext[slotId].mCmdsQ.size() != 0) {
+ callDelayedMsg(slotId);
+ } else {
+ mStkContext[slotId].mCmdInProgress = false;
+ }
+ }
+
+ private void sendResponse(int resId, int slotId, boolean confirm) {
+ Message msg = mServiceHandler.obtainMessage();
+ msg.arg1 = OP_RESPONSE;
+ Bundle args = new Bundle();
+ args.putInt(StkAppService.RES_ID, resId);
+ args.putInt(SLOT_ID, slotId);
+ args.putBoolean(StkAppService.CONFIRMATION, confirm);
+ msg.obj = args;
+ mServiceHandler.sendMessage(msg);
+ }
+
private boolean isCmdInteractive(CatCmdMessage cmd) {
switch (cmd.getCmdType()) {
case SEND_DTMF:
@@ -639,6 +701,7 @@
case CLOSE_CHANNEL:
case RECEIVE_DATA:
case SEND_DATA:
+ case SET_UP_EVENT_LIST:
return false;
}
@@ -681,6 +744,9 @@
}
private void handleSessionEnd(int slotId) {
+ // We should finish all pending activity if receiving END SESSION command.
+ cleanUpInstanceStackBySlot(slotId);
+
mStkContext[slotId].mCurrentCmd = mStkContext[slotId].mMainCmd;
CatLog.d(LOG_TAG, "[handleSessionEnd] - mCurrentCmd changed to mMainCmd!.");
mStkContext[slotId].mCurrentMenuCmd = mStkContext[slotId].mMainCmd;
@@ -691,9 +757,6 @@
mStkContext[slotId].mIsMenuPending = false;
mStkContext[slotId].mIsDialogPending = false;
- // We should finish all pending activity if receiving END SESSION command.
- cleanUpInstanceStackBySlot(slotId);
-
if (mStkContext[slotId].mMainCmd == null) {
CatLog.d(LOG_TAG, "[handleSessionEnd][mMainCmd is null!]");
}
@@ -723,7 +786,21 @@
}
}
+ // returns true if any Stk related activity already has focus on the screen
+ private boolean isTopOfStack() {
+ ActivityManager mAcivityManager = (ActivityManager) mContext
+ .getSystemService(ACTIVITY_SERVICE);
+ String currentPackageName = mAcivityManager.getRunningTasks(1).get(0).topActivity
+ .getPackageName();
+ if (null != currentPackageName) {
+ return currentPackageName.equals(PACKAGE_NAME);
+ }
+
+ return false;
+ }
+
private void handleCmd(CatCmdMessage cmdMsg, int slotId) {
+
if (cmdMsg == null) {
return;
}
@@ -739,7 +816,6 @@
switch (cmdMsg.getCmdType()) {
case DISPLAY_TEXT:
TextMessage msg = cmdMsg.geTextMessage();
- mStkContext[slotId].responseNeeded = msg.responseNeeded;
waitForUsersResponse = msg.responseNeeded;
if (mStkContext[slotId].lastSelectedItem != null) {
msg.title = mStkContext[slotId].lastSelectedItem;
@@ -749,7 +825,23 @@
// TODO: get the carrier name from the SIM
msg.title = "";
}
- launchTextDialog(slotId);
+ //If we receive a low priority Display Text and the device is
+ // not displaying any STK related activity and the screen is not idle
+ // ( that is, device is in an interactive state), then send a screen busy
+ // terminal response. Otherwise display the message. The existing
+ // displayed message shall be updated with the new display text
+ // proactive command (Refer to ETSI TS 102 384 section 27.22.4.1.4.4.2).
+ if (!(msg.isHighPriority || mStkContext[slotId].mMenuIsVisible
+ || mStkContext[slotId].mDisplayTextDlgIsVisibile || isTopOfStack())) {
+ if(!isScreenIdle()) {
+ CatLog.d(LOG_TAG, "Screen is not idle");
+ sendScreenBusyResponse(slotId);
+ } else {
+ launchTextDialog(slotId);
+ }
+ } else {
+ launchTextDialog(slotId);
+ }
break;
case SELECT_ITEM:
CatLog.d(LOG_TAG, "SELECT_ITEM +");
@@ -768,6 +860,7 @@
int i = 0;
CatLog.d(LOG_TAG, "removeMenu() - Uninstall App");
mStkContext[slotId].mCurrentMenu = null;
+ mStkContext[slotId].mMainCmd = null;
//Check other setup menu state. If all setup menu are removed, uninstall apk.
for (i = PhoneConstants.SIM_ID_1; i < mSimCount; i++) {
if (i != slotId
@@ -795,12 +888,23 @@
break;
case SET_UP_IDLE_MODE_TEXT:
waitForUsersResponse = false;
- launchIdleText(slotId);
+ mStkContext[slotId].mIdleModeTextCmd = mStkContext[slotId].mCurrentCmd;
+ TextMessage idleModeText = mStkContext[slotId].mCurrentCmd.geTextMessage();
+ if (idleModeText == null) {
+ launchIdleText(slotId);
+ mStkContext[slotId].mIdleModeTextCmd = null;
+ }
+ mStkContext[slotId].mCurrentCmd = mStkContext[slotId].mMainCmd;
+ if ((mStkContext[slotId].mIdleModeTextCmd != null) && isScreenIdle()) {
+ CatLog.d(this, "set up idle mode");
+ launchIdleText(slotId);
+ }
break;
case SEND_DTMF:
case SEND_SMS:
case SEND_SS:
case SEND_USSD:
+ case GET_CHANNEL_STATUS:
waitForUsersResponse = false;
launchEventMessage(slotId);
break;
@@ -808,8 +912,12 @@
launchConfirmationDialog(mStkContext[slotId].mCurrentCmd.geTextMessage(), slotId);
break;
case SET_UP_CALL:
- launchConfirmationDialog(mStkContext[slotId].mCurrentCmd.getCallSettings()
- .confirmMsg, slotId);
+ TextMessage mesg = mStkContext[slotId].mCurrentCmd.getCallSettings().confirmMsg;
+ if((mesg != null) && (mesg.text == null || mesg.text.length() == 0)) {
+ mesg.text = getResources().getString(R.string.default_setup_call_msg);
+ }
+ CatLog.d(this, "SET_UP_CALL mesg.text " + mesg.text);
+ launchConfirmationDialog(mesg, slotId);
break;
case PLAY_TONE:
launchToneDialog(slotId);
@@ -840,6 +948,16 @@
*/
launchEventMessage(slotId);
break;
+ case SET_UP_EVENT_LIST:
+ mStkContext[slotId].mSetupEventListSettings =
+ mStkContext[slotId].mCurrentCmd.getSetEventList();
+ mStkContext[slotId].mCurrentSetupEventCmd = mStkContext[slotId].mCurrentCmd;
+ mStkContext[slotId].mCurrentCmd = mStkContext[slotId].mMainCmd;
+ if (isScreenIdle()) {
+ CatLog.d(this," Check if IDLE_SCREEN_AVAILABLE_EVENT is present in List");
+ checkForSetupEvent(IDLE_SCREEN_AVAILABLE_EVENT, null, slotId);
+ }
+ break;
}
if (!waitForUsersResponse) {
@@ -858,14 +976,7 @@
}
if (mStkService[slotId] == null) {
- if(null != UiccController.getInstance() &&
- null != UiccController.getInstance().getUiccCard(slotId)) {
- mStkService[slotId] = UiccController.getInstance().getUiccCard(slotId)
- .getCatService();
- } else {
- CatLog.d(LOG_TAG, "Null instance: [" + UiccController.getInstance() +
- "],["+UiccController.getInstance().getUiccCard(slotId)+"]");
- }
+ mStkService[slotId] = CatService.getInstance(slotId);
if (mStkService[slotId] == null) {
// This should never happen (we should be responding only to a message
// that arrived from StkService). It has to exist by this time
@@ -921,7 +1032,7 @@
switch (mStkContext[slotId].mCurrentCmd.getCmdType()) {
case DISPLAY_TEXT:
resMsg.setResultCode(confirmed ? ResultCode.OK
- : ResultCode.UICC_SESSION_TERM_BY_USER);
+ : ResultCode.UICC_SESSION_TERM_BY_USER);
break;
case LAUNCH_BROWSER:
resMsg.setResultCode(confirmed ? ResultCode.OK
@@ -936,6 +1047,8 @@
resMsg.setResultCode(ResultCode.OK);
resMsg.setConfirmation(confirmed);
if (confirmed) {
+ CatLog.d(this, "Going back to mainMenu before starting a call.");
+ launchMenuActivity(null, slotId);
launchEventMessage(slotId,
mStkContext[slotId].mCurrentCmd.getCallSettings().callMsg);
}
@@ -1021,6 +1134,10 @@
Activity activity = mStkContext[slotId].getPendingActivityInstance();
Activity dialog = mStkContext[slotId].getPendingDialogInstance();
CatLog.d(LOG_TAG, "cleanUpInstanceStackBySlot slotId: " + slotId);
+ if (mStkContext[slotId].mCurrentCmd == null) {
+ CatLog.d(LOG_TAG, "current cmd is null.");
+ return;
+ }
if (activity != null) {
CatLog.d(LOG_TAG, "current cmd type: " +
mStkContext[slotId].mCurrentCmd.getCmdType());
@@ -1108,14 +1225,6 @@
CatLog.d(LOG_TAG, "launchMenuActivity, mMainActivityInstance is not null");
return;
}
- // If END SESSION is sent that results from the activity is finished by
- // stkappservice (line 457), we should igonore to display the stk main menu
- // of slot id.
- if (mStkContext[slotId].mBackGroundTRSent) {
- CatLog.d(LOG_TAG, "launchMenuActivity, ES is triggered by BG.");
- mStkContext[slotId].mBackGroundTRSent = false;
- return;
- }
}
//If the last pending menu is secondary menu, "STATE" should be "STATE_SECONDARY".
@@ -1173,6 +1282,12 @@
newIntent.putExtra("TEXT", mStkContext[slotId].mCurrentCmd.geTextMessage());
newIntent.putExtra(SLOT_ID, slotId);
startActivity(newIntent);
+ // For display texts with immediate response, send the terminal response
+ // immediately. responseNeeded will be false, if display text command has
+ // the immediate response tlv.
+ if (!mStkContext[slotId].mCurrentCmd.geTextMessage().responseNeeded) {
+ sendResponse(RES_ID_CONFIRM, slotId, true);
+ }
}
}
@@ -1191,6 +1306,87 @@
return activated;
}
+ private void sendSetUpEventResponse(int event, byte[] addedInfo, int slotId) {
+ CatLog.d(this, "sendSetUpEventResponse: event : " + event + "slotId = " + slotId);
+
+ if (mStkContext[slotId].mCurrentSetupEventCmd == null){
+ CatLog.e(this, "mCurrentSetupEventCmd is null");
+ return;
+ }
+
+ CatResponseMessage resMsg = new CatResponseMessage(mStkContext[slotId].mCurrentSetupEventCmd);
+
+ resMsg.setResultCode(ResultCode.OK);
+ resMsg.setEventDownload(event, addedInfo);
+
+ mStkService[slotId].onCmdResponse(resMsg);
+ }
+
+ private void checkForSetupEvent(int event, Bundle args, int slotId) {
+ boolean eventPresent = false;
+ byte[] addedInfo = null;
+ CatLog.d(this, "Event :" + event);
+
+ if (mStkContext[slotId].mSetupEventListSettings != null) {
+ /* Checks if the event is present in the EventList updated by last
+ * SetupEventList Proactive Command */
+ for (int i : mStkContext[slotId].mSetupEventListSettings.eventList) {
+ if (event == i) {
+ eventPresent = true;
+ break;
+ }
+ }
+
+ /* If Event is present send the response to ICC */
+ if (eventPresent == true) {
+ CatLog.d(this, " Event " + event + "exists in the EventList");
+
+ switch (event) {
+ case IDLE_SCREEN_AVAILABLE_EVENT:
+ sendSetUpEventResponse(event, addedInfo, slotId);
+ removeSetUpEvent(event, slotId);
+ break;
+ case LANGUAGE_SELECTION_EVENT:
+ String language = mContext
+ .getResources().getConfiguration().locale.getLanguage();
+ CatLog.d(this, "language: " + language);
+ // Each language code is a pair of alpha-numeric characters.
+ // Each alpha-numeric character shall be coded on one byte
+ // using the SMS default 7-bit coded alphabet
+ addedInfo = GsmAlphabet.stringToGsm8BitPacked(language);
+ sendSetUpEventResponse(event, addedInfo, slotId);
+ break;
+ default:
+ break;
+ }
+ } else {
+ CatLog.e(this, " Event does not exist in the EventList");
+ }
+ } else {
+ CatLog.e(this, "SetupEventList is not received. Ignoring the event: " + event);
+ }
+ }
+
+ private void removeSetUpEvent(int event, int slotId) {
+ CatLog.d(this, "Remove Event :" + event);
+
+ if (mStkContext[slotId].mSetupEventListSettings != null) {
+ /*
+ * Make new Eventlist without the event
+ */
+ for (int i = 0; i < mStkContext[slotId].mSetupEventListSettings.eventList.length; i++) {
+ if (event == mStkContext[slotId].mSetupEventListSettings.eventList[i]) {
+ mStkContext[slotId].mSetupEventListSettings.eventList[i] = INVALID_SETUP_EVENT;
+ break;
+ }
+ }
+ }
+ }
+
+ private void launchEventMessage(int slotId) {
+ launchEventMessage(slotId, mStkContext[slotId].mCurrentCmd.geTextMessage());
+ }
+
private void launchEventMessage(int slotId, TextMessage msg) {
if (msg == null || (msg.text != null && msg.text.length() == 0)) {
CatLog.d(LOG_TAG, "launchEventMessage return");
@@ -1220,10 +1416,6 @@
toast.show();
}
- private void launchEventMessage(int slotId) {
- launchEventMessage(slotId, mStkContext[slotId].mCurrentCmd.geTextMessage());
- }
-
private void launchConfirmationDialog(TextMessage msg, int slotId) {
msg.title = mStkContext[slotId].lastSelectedItem;
Intent newIntent = new Intent();
@@ -1297,21 +1489,17 @@
}
private void launchIdleText(int slotId) {
- TextMessage msg = mStkContext[slotId].mCurrentCmd.geTextMessage();
+ TextMessage msg = mStkContext[slotId].mIdleModeTextCmd.geTextMessage();
- if (msg == null) {
- CatLog.d(LOG_TAG, "mCurrent.getTextMessage is NULL");
+ if (msg == null || msg.text ==null) {
+ CatLog.d(LOG_TAG, msg == null ? "mCurrent.getTextMessage is NULL"
+ : "mCurrent.getTextMessage.text is NULL");
mNotificationManager.cancel(getNotificationId(slotId));
return;
- }
- CatLog.d(LOG_TAG, "launchIdleText - text[" + msg.text
- + "] iconSelfExplanatory[" + msg.iconSelfExplanatory
- + "] icon[" + msg.icon + "], sim id: " + slotId);
-
- if (msg.text == null) {
- CatLog.d(LOG_TAG, "cancel IdleMode text");
- mNotificationManager.cancel(getNotificationId(slotId));
} else {
+ CatLog.d(LOG_TAG, "launchIdleText - text[" + msg.text
+ + "] iconSelfExplanatory[" + msg.iconSelfExplanatory
+ + "] icon[" + msg.icon + "], sim id: " + slotId);
CatLog.d(LOG_TAG, "Add IdleMode text");
PendingIntent pendingIntent = PendingIntent.getService(mContext, 0,
new Intent(mContext, StkAppService.class), 0);
@@ -1485,6 +1673,7 @@
mStkContext[slotId].mSetupMenuState = STATE_EXIST;
return false;
}
+
StkContext getStkContext(int slotId) {
if (slotId >= 0 && slotId < mSimCount) {
return mStkContext[slotId];
@@ -1493,4 +1682,13 @@
return null;
}
}
+
+ private void handleAlphaNotify(Bundle args) {
+ String alphaString = args.getString(AppInterface.ALPHA_STRING);
+
+ CatLog.d(this, "Alpha string received from card: " + alphaString);
+ Toast toast = Toast.makeText(sInstance, alphaString, Toast.LENGTH_LONG);
+ toast.setGravity(Gravity.TOP, 0, 0);
+ toast.show();
+ }
}
diff --git a/src/com/android/stk/StkCmdReceiver.java b/src/com/android/stk/StkCmdReceiver.java
index 254c7fb..508e7f8 100644
--- a/src/com/android/stk/StkCmdReceiver.java
+++ b/src/com/android/stk/StkCmdReceiver.java
@@ -42,12 +42,18 @@
handleAction(context, intent, StkAppService.OP_END_SESSION);
} else if (action.equals(AppInterface.CAT_ICC_STATUS_CHANGE)) {
handleAction(context, intent, StkAppService.OP_CARD_STATUS_CHANGED);
+ } else if (action.equals(Intent.ACTION_LOCALE_CHANGED)) {
+ handleLocaleChange(context);
+ } else if (action.equals(AppInterface.CAT_ALPHA_NOTIFY_ACTION)) {
+ handleAction(context, intent, StkAppService.OP_ALPHA_NOTIFY);
+ } else if (action.equals(Intent.ACTION_SCREEN_OFF)) {
+ handleIdleScreen(context);
}
}
private void handleAction(Context context, Intent intent, int op) {
Bundle args = new Bundle();
- int slot_id = intent.getIntExtra(StkAppService.SLOT_ID,0);
+ int slot_id = intent.getIntExtra(StkAppService.SLOT_ID, 0);
args.putInt(StkAppService.OPCODE, op);
args.putInt(StkAppService.SLOT_ID, slot_id);
@@ -68,11 +74,29 @@
args.putInt(AppInterface.REFRESH_RESULT,
intent.getIntExtra(AppInterface.REFRESH_RESULT,
IccRefreshResponse.REFRESH_RESULT_FILE_UPDATE));
+ } else if (StkAppService.OP_ALPHA_NOTIFY == op) {
+ String alphaString = intent.getStringExtra(AppInterface.ALPHA_STRING);
+ args.putString(AppInterface.ALPHA_STRING, alphaString);
}
+
CatLog.d("StkCmdReceiver", "handleAction, op: " + op +
"args: " + args + ", slot id: " + slot_id);
Intent toService = new Intent(context, StkAppService.class);
toService.putExtras(args);
context.startService(toService);
}
+
+ private void handleLocaleChange(Context context) {
+ Bundle args = new Bundle();
+ args.putInt(StkAppService.OPCODE, StkAppService.OP_LOCALE_CHANGED);
+ context.startService(new Intent(context, StkAppService.class)
+ .putExtras(args));
+ }
+
+ private void handleIdleScreen(Context context) {
+ Bundle args = new Bundle();
+ args.putInt(StkAppService.OPCODE, StkAppService.OP_IDLE_SCREEN);
+ context.startService(new Intent(context, StkAppService.class)
+ .putExtras(args));
+ }
}
diff --git a/src/com/android/stk/StkDialogActivity.java b/src/com/android/stk/StkDialogActivity.java
old mode 100755
new mode 100644
index b09aa40..24e1068
--- a/src/com/android/stk/StkDialogActivity.java
+++ b/src/com/android/stk/StkDialogActivity.java
@@ -18,13 +18,18 @@
import com.android.internal.telephony.cat.CatLog;
import com.android.internal.telephony.cat.TextMessage;
+import com.android.internal.telephony.cat.CatLog;
import android.app.Activity;
+import android.app.AlarmManager;
+import android.app.PendingIntent;
import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.BroadcastReceiver;
+import android.content.Context;
import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
+import android.os.SystemClock;
import android.view.KeyEvent;
import android.view.View;
import android.view.Window;
@@ -32,7 +37,7 @@
import android.widget.TextView;
/**
- * AlretDialog used for DISPLAY TEXT commands.
+ * AlertDialog used for DISPLAY TEXT commands.
*
*/
public class StkDialogActivity extends Activity implements View.OnClickListener {
@@ -42,20 +47,13 @@
TextMessage mTextMsg = null;
private int mSlotId = -1;
private StkAppService appService = StkAppService.getInstance();
+ // Determines whether Terminal Response (TR) has been sent
private boolean mIsResponseSent = false;
-
- Handler mTimeoutHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- switch(msg.what) {
- case MSG_ID_TIMEOUT:
- CatLog.d(LOG_TAG, "MSG_ID_TIMEOUT finish.");
- sendResponse(StkAppService.RES_ID_TIMEOUT);
- finish();
- break;
- }
- }
- };
+ private Context mContext;
+ // Utilize AlarmManager for real-time countdown
+ private PendingIntent mTimeoutIntent;
+ private AlarmManager mAlarmManager;
+ private final static String ALARM_TIMEOUT = "com.android.stk.DIALOG_ALARM_TIMEOUT";
//keys) for saving the state of the dialog in the icicle
private static final String TEXT = "text";
@@ -71,19 +69,13 @@
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
- CatLog.d(LOG_TAG, "onCreate");
- initFromIntent(getIntent());
- if (mTextMsg == null) {
- finish();
- return;
- }
+ CatLog.d(LOG_TAG, "onCreate, sim id: " + mSlotId);
+ // New Dialog is created - set to no response sent
+ mIsResponseSent = false;
requestWindowFeature(Window.FEATURE_LEFT_ICON);
- Window window = getWindow();
setContentView(R.layout.stk_msg_dialog);
- TextView mMessageView = (TextView) window
- .findViewById(R.id.dialog_message);
Button okButton = (Button) findViewById(R.id.button_ok);
Button cancelButton = (Button) findViewById(R.id.button_cancel);
@@ -91,38 +83,29 @@
okButton.setOnClickListener(this);
cancelButton.setOnClickListener(this);
- setTitle(mTextMsg.title);
- if (!(mTextMsg.iconSelfExplanatory && mTextMsg.icon != null)) {
- mMessageView.setText(mTextMsg.text);
- }
+ mContext = getBaseContext();
+ IntentFilter intentFilter = new IntentFilter();
+ intentFilter.addAction(ALARM_TIMEOUT);
+ mContext.registerReceiver(mBroadcastReceiver, intentFilter);
+ mAlarmManager =(AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE);
- if (mTextMsg.icon == null) {
- CatLog.d(LOG_TAG, "onCreate icon is null");
- window.setFeatureDrawableResource(Window.FEATURE_LEFT_ICON,
- com.android.internal.R.drawable.stat_notify_sim_toolkit);
- } else {
- window.setFeatureDrawable(Window.FEATURE_LEFT_ICON,
- new BitmapDrawable(mTextMsg.icon));
- }
}
public void onClick(View v) {
String input = null;
-
switch (v.getId()) {
case OK_BUTTON:
CatLog.d(LOG_TAG, "OK Clicked!, mSlotId: " + mSlotId);
- sendResponse(StkAppService.RES_ID_CONFIRM, true);
cancelTimeOut();
- finish();
+ sendResponse(StkAppService.RES_ID_CONFIRM, true);
break;
case CANCEL_BUTTON:
CatLog.d(LOG_TAG, "Cancel Clicked!, mSlotId: " + mSlotId);
- sendResponse(StkAppService.RES_ID_CONFIRM, false);
cancelTimeOut();
- finish();
+ sendResponse(StkAppService.RES_ID_CONFIRM, false);
break;
}
+ finish();
}
@Override
@@ -143,36 +126,83 @@
super.onResume();
CatLog.d(LOG_TAG, "onResume - mIsResponseSent[" + mIsResponseSent +
"], sim id: " + mSlotId);
- /*
- * The user should be shown the message forever or until some high
- * priority event occurs (such as incoming call, MMI code execution
- * etc as mentioned in ETSI 102.223, 6.4.1).
- *
- * Since mTextMsg.responseNeeded is false (because the response has
- * already been sent) and duration of the dialog is zero and userClear
- * is true, don't set the timeout.
- */
- if (!mTextMsg.responseNeeded &&
- StkApp.calculateDurationInMilis(mTextMsg.duration) == 0 &&
- mTextMsg.userClear) {
- CatLog.d(this, "User should clear text..show message forever");
+
+ initFromIntent(getIntent());
+ if (mTextMsg == null) {
+ finish();
return;
}
- startTimeOut(mTextMsg.userClear);
+ Window window = getWindow();
+
+ TextView mMessageView = (TextView) window
+ .findViewById(R.id.dialog_message);
+
+ setTitle(mTextMsg.title);
+
+ if (!(mTextMsg.iconSelfExplanatory && mTextMsg.icon != null)) {
+ mMessageView.setText(mTextMsg.text);
+ }
+
+ if (mTextMsg.icon == null) {
+ window.setFeatureDrawableResource(Window.FEATURE_LEFT_ICON,
+ com.android.internal.R.drawable.stat_notify_sim_toolkit);
+ } else {
+ window.setFeatureDrawable(Window.FEATURE_LEFT_ICON,
+ new BitmapDrawable(mTextMsg.icon));
+ }
+
+ /*
+ * If the userClear flag is set and dialogduration is set to 0, the display Text
+ * should be displayed to user forever until some high priority event occurs
+ * (incoming call, MMI code execution etc as mentioned under section
+ * ETSI 102.223, 6.4.1)
+ */
+ if (StkApp.calculateDurationInMilis(mTextMsg.duration) == 0 &&
+ !mTextMsg.responseNeeded && mTextMsg.userClear) {
+ CatLog.d(LOG_TAG, "User should clear text..showing message forever");
+ return;
+ }
+
+ appService.setDisplayTextDlgVisibility(true, mSlotId);
+
+ /*
+ * When another activity takes the foreground, we do not want the Terminal
+ * Response timer to be restarted when our activity resumes. Hence we will
+ * check if there is an existing timer, and resume it. In this way we will
+ * inform the SIM in correct time when there is no response from the User
+ * to a dialog.
+ */
+ if (mTimeoutIntent != null) {
+ CatLog.d(LOG_TAG, "Pending Alarm! Let it finish counting down...");
+ }
+ else {
+ CatLog.d(LOG_TAG, "No Pending Alarm! OK to start timer...");
+ startTimeOut(mTextMsg.userClear);
+ }
}
@Override
public void onPause() {
super.onPause();
CatLog.d(LOG_TAG, "onPause, sim id: " + mSlotId);
- cancelTimeOut();
+ appService.setDisplayTextDlgVisibility(false, mSlotId);
+
+ /*
+ * do not cancel the timer here cancelTimeOut(). If any higher/lower
+ * priority events such as incoming call, new sms, screen off intent,
+ * notification alerts, user actions such as 'User moving to another activtiy'
+ * etc.. occur during Display Text ongoing session,
+ * this activity would receive 'onPause()' event resulting in
+ * cancellation of the timer. As a result no terminal response is
+ * sent to the card.
+ */
}
@Override
protected void onStart() {
+ CatLog.d(LOG_TAG, "onStart, sim id: " + mSlotId);
super.onStart();
- mIsResponseSent = false;
}
@Override
@@ -187,7 +217,6 @@
appService.getStkContext(mSlotId).setPendingDialogInstance(null);
cancelTimeOut();
finish();
- CatLog.d(LOG_TAG, "finish.");
}
}
@@ -203,6 +232,10 @@
sendResponse(StkAppService.RES_ID_CONFIRM, false);
}
cancelTimeOut();
+ // Cleanup broadcast receivers to avoid leaks
+ if (mBroadcastReceiver != null) {
+ unregisterReceiver(mBroadcastReceiver);
+ }
}
@Override
@@ -222,6 +255,12 @@
CatLog.d(LOG_TAG, "onRestoreInstanceState - [" + mTextMsg + "]");
}
+ @Override
+ protected void onNewIntent(Intent intent) {
+ CatLog.d(LOG_TAG, "onNewIntent - updating the same Dialog box");
+ setIntent(intent);
+ }
+
private void sendResponse(int resId, boolean confirmed) {
if (mSlotId == -1) {
CatLog.d(LOG_TAG, "sim id is invalid");
@@ -235,13 +274,15 @@
CatLog.d(LOG_TAG, "sendResponse resID[" + resId + "] confirmed[" + confirmed + "]");
- Bundle args = new Bundle();
- args.putInt(StkAppService.OPCODE, StkAppService.OP_RESPONSE);
- args.putInt(StkAppService.SLOT_ID, mSlotId);
- args.putInt(StkAppService.RES_ID, resId);
- args.putBoolean(StkAppService.CONFIRMATION, confirmed);
- startService(new Intent(this, StkAppService.class).putExtras(args));
- mIsResponseSent = true;
+ if (mTextMsg.responseNeeded) {
+ Bundle args = new Bundle();
+ args.putInt(StkAppService.OPCODE, StkAppService.OP_RESPONSE);
+ args.putInt(StkAppService.SLOT_ID, mSlotId);
+ args.putInt(StkAppService.RES_ID, resId);
+ args.putBoolean(StkAppService.CONFIRMATION, confirmed);
+ startService(new Intent(this, StkAppService.class).putExtras(args));
+ mIsResponseSent = true;
+ }
}
private void sendResponse(int resId) {
@@ -262,10 +303,14 @@
private void cancelTimeOut() {
CatLog.d(LOG_TAG, "cancelTimeOut: " + mSlotId);
- mTimeoutHandler.removeMessages(MSG_ID_TIMEOUT);
+ if (mTimeoutIntent != null) {
+ mAlarmManager.cancel(mTimeoutIntent);
+ mTimeoutIntent = null;
+ }
}
private void startTimeOut(boolean waitForUserToClear) {
+
// Reset timeout.
cancelTimeOut();
int dialogDuration = StkApp.calculateDurationInMilis(mTextMsg.duration);
@@ -274,7 +319,7 @@
if (mTextMsg.userClear == true && mTextMsg.responseNeeded == false) {
return;
} else {
- // userClear = false. will dissapear after a while.
+ // userClear = false. will disappear after a while.
if (dialogDuration == 0) {
if (waitForUserToClear) {
dialogDuration = StkApp.DISP_TEXT_WAIT_FOR_USER_TIMEOUT;
@@ -283,8 +328,35 @@
}
}
CatLog.d(LOG_TAG, "startTimeOut: " + mSlotId);
- mTimeoutHandler.sendMessageDelayed(mTimeoutHandler
- .obtainMessage(MSG_ID_TIMEOUT), dialogDuration);
+ Intent mAlarmIntent = new Intent(ALARM_TIMEOUT);
+ mAlarmIntent.putExtra(StkAppService.SLOT_ID, mSlotId);
+ mTimeoutIntent = PendingIntent.getBroadcast(mContext, 0, mAlarmIntent, PendingIntent.FLAG_CANCEL_CURRENT);
+
+ // Try to use a more stringent timer not affected by system sleep.
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+ mAlarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP,
+ SystemClock.elapsedRealtime() + dialogDuration, mTimeoutIntent);
+ }
+ else {
+ mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,
+ SystemClock.elapsedRealtime() + dialogDuration, mTimeoutIntent);
+ }
}
}
+
+ private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+ @Override public void onReceive(Context context, Intent intent) {
+ String action = intent.getAction();
+ int slotID = intent.getIntExtra(StkAppService.SLOT_ID, 0);
+
+ if (action == null || slotID != mSlotId) return;
+ CatLog.d(LOG_TAG, "onReceive, action=" + action + ", sim id: " + slotID);
+ if (action.equals(ALARM_TIMEOUT)) {
+ CatLog.d(LOG_TAG, "ALARM_TIMEOUT rcvd");
+ mTimeoutIntent = null;
+ sendResponse(StkAppService.RES_ID_TIMEOUT);
+ finish();
+ }
+ }
+ };
}
diff --git a/src/com/android/stk/StkInputActivity.java b/src/com/android/stk/StkInputActivity.java
old mode 100755
new mode 100644
index bfaa36d..69223c3
--- a/src/com/android/stk/StkInputActivity.java
+++ b/src/com/android/stk/StkInputActivity.java
@@ -123,6 +123,7 @@
break;
}
CatLog.d(LOG_TAG, "handleClick, ready to response");
+ cancelTimeOut();
appService.getStkContext(mSlotId).setPendingActivityInstance(this);
sendResponse(StkAppService.RES_ID_INPUT, input, false);
}
@@ -217,6 +218,7 @@
case KeyEvent.KEYCODE_BACK:
CatLog.d(LOG_TAG, "onKeyDown - KEYCODE_BACK");
mAcceptUsersInput = false;
+ cancelTimeOut();
appService.getStkContext(mSlotId).setPendingActivityInstance(this);
sendResponse(StkAppService.RES_ID_BACKWARD, null, false);
return true;
diff --git a/src/com/android/stk/StkLauncherActivity.java b/src/com/android/stk/StkLauncherActivity.java
old mode 100755
new mode 100644
index 9066c3e..73529e9
--- a/src/com/android/stk/StkLauncherActivity.java
+++ b/src/com/android/stk/StkLauncherActivity.java
@@ -62,21 +62,13 @@
mContext = getBaseContext();
mTm = (TelephonyManager) mContext.getSystemService(
Context.TELEPHONY_SERVICE);
- //Check if needs to show the menu list.
- if (isShowSTKListMenu()) {
- requestWindowFeature(Window.FEATURE_NO_TITLE);
- setContentView(R.layout.stk_menu_list);
- mTitleTextView = (TextView) findViewById(R.id.title_text);
- mTitleIconView = (ImageView) findViewById(R.id.title_icon);
- mTitleTextView.setText(R.string.app_name);
- mBitMap = BitmapFactory.decodeResource(getResources(),
- R.drawable.ic_launcher_sim_toolkit);
- } else {
- //launch stk menu activity for the SIM.
- if (mSingleSimId < 0) {
- finish();
- }
- }
+ requestWindowFeature(Window.FEATURE_NO_TITLE);
+ setContentView(R.layout.stk_menu_list);
+ mTitleTextView = (TextView) findViewById(R.id.title_text);
+ mTitleIconView = (ImageView) findViewById(R.id.title_icon);
+ mTitleTextView.setText(R.string.app_name);
+ mBitMap = BitmapFactory.decodeResource(getResources(),
+ R.drawable.ic_launcher_sim_toolkit);
}
@Override
@@ -201,30 +193,6 @@
return 0;
}
}
- private boolean isShowSTKListMenu() {
- int simCount = TelephonyManager.from(mContext).getSimCount();
- int simInsertedCount = 0;
- int insertedSlotId = -1;
-
- CatLog.d(LOG_TAG, "simCount: " + simCount);
- for (int i = 0; i < simCount; i++) {
- //Check if the card is inserted.
- if (mTm.hasIccCard(i)) {
- CatLog.d(LOG_TAG, "SIM " + i + " is inserted.");
- mSingleSimId = i;
- simInsertedCount++;
- } else {
- CatLog.d(LOG_TAG, "SIM " + i + " is not inserted.");
- }
- }
- if (simInsertedCount > 1) {
- return true;
- } else {
- //No card or only one card.
- CatLog.d(LOG_TAG, "do not show stk list menu.");
- return false;
- }
- }
private void launchSTKMainMenu(int slodId) {
Bundle args = new Bundle();
CatLog.d(LOG_TAG, "launchSTKMainMenu.");
diff --git a/src/com/android/stk/StkMain.java b/src/com/android/stk/StkMain.java
new file mode 100644
index 0000000..2be33ab
--- /dev/null
+++ b/src/com/android/stk/StkMain.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2014 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.
+ */
+
+package com.android.stk;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import com.android.internal.telephony.cat.CatLog;
+import com.android.internal.telephony.PhoneConstants;
+
+import android.telephony.TelephonyManager;
+
+import android.view.Gravity;
+import android.widget.Toast;
+
+/**
+ * Launcher class. Serve as the app's MAIN activity, send an intent to the
+ * StkAppService and finish.
+ *
+ */
+ public class StkMain extends Activity {
+ private static final String className = new Object(){}.getClass().getEnclosingClass().getName();
+ private static final String LOG_TAG = className.substring(className.lastIndexOf('.') + 1);
+ private int mSingleSimId = -1;
+ private Context mContext = null;
+ private TelephonyManager mTm = null;
+ private static final String PACKAGE_NAME = "com.android.stk";
+ private static final String STK_LAUNCHER_ACTIVITY_NAME = PACKAGE_NAME + ".StkLauncherActivity";
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ CatLog.d(LOG_TAG, "onCreate+");
+ mContext = getBaseContext();
+ mTm = (TelephonyManager) mContext.getSystemService(
+ Context.TELEPHONY_SERVICE);
+ //Check if needs to show the meun list.
+ if (isShowSTKListMenu()) {
+ Intent newIntent = new Intent(Intent.ACTION_VIEW);
+ newIntent.setClassName(PACKAGE_NAME, STK_LAUNCHER_ACTIVITY_NAME);
+ startActivity(newIntent);
+ } else {
+ //launch stk menu activity for the SIM.
+ if (mSingleSimId < 0) {
+ showTextToast(mContext, R.string.no_sim_card_inserted);
+ } else {
+ launchSTKMainMenu(mSingleSimId);
+ }
+ }
+ finish();
+ }
+
+ private boolean isShowSTKListMenu() {
+ int simCount = TelephonyManager.from(mContext).getSimCount();
+ int simInsertedCount = 0;
+ int insertedSlotId = -1;
+
+ CatLog.d(LOG_TAG, "simCount: " + simCount);
+ for (int i = 0; i < simCount; i++) {
+ //Check if the card is inserted.
+ if (mTm.hasIccCard(i)) {
+ CatLog.d(LOG_TAG, "SIM " + i + " is inserted.");
+ mSingleSimId = i;
+ simInsertedCount++;
+ } else {
+ CatLog.d(LOG_TAG, "SIM " + i + " is not inserted.");
+ }
+ }
+ if (simInsertedCount > 1) {
+ return true;
+ } else {
+ //No card or only one card.
+ CatLog.d(LOG_TAG, "do not show stk list menu.");
+ return false;
+ }
+ }
+
+ private void launchSTKMainMenu(int slotId) {
+ Bundle args = new Bundle();
+ CatLog.d(LOG_TAG, "launchSTKMainMenu.");
+ args.putInt(StkAppService.OPCODE, StkAppService.OP_LAUNCH_APP);
+ args.putInt(StkAppService.SLOT_ID
+ , PhoneConstants.SIM_ID_1 + slotId);
+ startService(new Intent(this, StkAppService.class)
+ .putExtras(args));
+ }
+
+ private void showTextToast(Context context, int resId) {
+ Toast toast = Toast.makeText(context, resId, Toast.LENGTH_LONG);
+ toast.setGravity(Gravity.BOTTOM, 0, 0);
+ toast.show();
+ }
+}
diff --git a/src/com/android/stk/StkMenuActivity.java b/src/com/android/stk/StkMenuActivity.java
old mode 100755
new mode 100644
index 9d307f6..2005971
--- a/src/com/android/stk/StkMenuActivity.java
+++ b/src/com/android/stk/StkMenuActivity.java
@@ -127,11 +127,13 @@
CatLog.d(LOG_TAG, "Item is null");
return;
}
+
CatLog.d(LOG_TAG, "onListItemClick Id: " + item.id + ", mState: " + mState);
// ONLY set SECONDARY menu. It will be finished when the following command is comming.
if (mState == STATE_SECONDARY) {
appService.getStkContext(mSlotId).setPendingActivityInstance(this);
}
+ cancelTimeOut();
sendResponse(StkAppService.RES_ID_MENU_SELECTION, item.id, false);
mAcceptUsersInput = false;
mProgressView.setVisibility(View.VISIBLE);
@@ -223,7 +225,17 @@
} else {
CatLog.d(LOG_TAG, "onPause: null appService.");
}
- cancelTimeOut();
+
+ /*
+ * do not cancel the timer here cancelTimeOut(). If any higher/lower
+ * priority events such as incoming call, new sms, screen off intent,
+ * notification alerts, user actions such as 'User moving to another activtiy'
+ * etc.. occur during SELECT ITEM ongoing session,
+ * this activity would receive 'onPause()' event resulting in
+ * cancellation of the timer. As a result no terminal response is
+ * sent to the card.
+ */
+
}
@Override