Merge "Empty toast should not be displayed"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
old mode 100644
new mode 100755
index 668a99e..aef271d
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,6 +22,8 @@
<original-package android:name="com.android.stk" />
+ <protected-broadcast android:name="com.android.stk.DIALOG_ALARM_TIMEOUT" />
+
<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" />
@@ -30,12 +32,15 @@
android:label="@string/app_name"
android:clearTaskOnLaunch="true"
android:process="com.android.phone"
- android:taskAffinity="android.task.stk">
+ android:taskAffinity="android.task.stk"
+ android:defaultToDeviceProtectedStorage="true"
+ android:directBootAware="true">
<activity android:name="StkMain"
android:theme="@android:style/Theme.NoDisplay"
android:label="@string/app_name"
android:enabled="false"
+ android:exported="true"
android:taskAffinity="android.task.stk.StkLauncherActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -44,8 +49,9 @@
</activity>
<activity android:name="StkLauncherActivity"
- android:theme="@android:style/Theme.NoTitleBar"
+ android:theme="@android:style/Theme.Material.Light"
android:label="@string/app_name"
+ android:exported="false"
android:taskAffinity="android.task.stk.StkLauncherActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@@ -55,10 +61,11 @@
</activity>
<activity android:name="StkMenuActivity"
- android:theme="@android:style/Theme.NoTitleBar"
+ android:theme="@android:style/Theme.Material.Light"
android:icon="@drawable/ic_launcher_sim_toolkit"
android:label="@string/app_name"
android:configChanges="orientation|locale|screenSize|keyboardHidden|mnc|mcc"
+ android:exported="false"
android:taskAffinity="android.task.stk.StkLauncherActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@@ -70,8 +77,9 @@
<activity android:name="StkInputActivity"
android:label="@string/app_name"
android:icon="@drawable/ic_launcher_sim_toolkit"
- android:theme="@android:style/Theme.Holo"
+ android:theme="@android:style/Theme.Material.Light"
android:configChanges="orientation|locale|screenSize|keyboardHidden"
+ android:exported="false"
android:taskAffinity="android.task.stk.StkLauncherActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@@ -81,31 +89,23 @@
</activity>
<activity android:name="StkDialogActivity"
android:configChanges="orientation|locale|screenSize|keyboardHidden"
- android:theme="@android:style/Theme.Dialog"
+ android:theme="@android:style/Theme.Material.Light"
+ android:exported="false"
android:taskAffinity="android.task.stk.StkLauncherActivity">
</activity>
<activity android:name="ToneDialog"
- android:theme="@android:style/Theme.Dialog">
- </activity>
-
- <!-- SIM Toolkit settings activity -->
- <activity android:name="StkSettings"
- android:label="@string/app_name">
- <intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <action android:name="android.intent.action.MAIN" />
- <category
- android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
- </intent-filter>
+ android:exported="false"
+ android:theme="@android:style/Theme.Material.Light"
+ android:taskAffinity="android.task.stk.StkLauncherActivity">
</activity>
<receiver android:name="com.android.stk.StkCmdReceiver">
<intent-filter>
- <action android:name= "android.intent.action.stk.command" />
- <action android:name= "android.intent.action.stk.session_end" />
- <action android:name= "android.intent.action.stk.icc_status_change" />
- <action android:name= "android.intent.action.stk.alpha_notify" />
+ <action android:name= "com.android.internal.stk.command" />
+ <action android:name= "com.android.internal.stk.session_end" />
+ <action android:name= "com.android.internal.stk.icc_status_change" />
+ <action android:name= "com.android.internal.stk.alpha_notify" />
<action android:name= "android.intent.action.LOCALE_CHANGED" />
</intent-filter>
</receiver>
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..e2a657c
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+amitmahajan@google.com
+rgreenwalt@google.com
+sanketpadawe@google.com
diff --git a/res/drawable-hdpi/ic_launcher_sim_toolkit.png b/res/drawable-hdpi/ic_launcher_sim_toolkit.png
index ce4ac43..51d6688 100644
--- a/res/drawable-hdpi/ic_launcher_sim_toolkit.png
+++ b/res/drawable-hdpi/ic_launcher_sim_toolkit.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_sim_toolkit.png b/res/drawable-mdpi/ic_launcher_sim_toolkit.png
index 0dfec74..913ab12 100755
--- a/res/drawable-mdpi/ic_launcher_sim_toolkit.png
+++ b/res/drawable-mdpi/ic_launcher_sim_toolkit.png
Binary files differ
diff --git a/res/layout/stk_input.xml b/res/layout/stk_input.xml
old mode 100644
new mode 100755
index 9c3807e..40c8b77
--- a/res/layout/stk_input.xml
+++ b/res/layout/stk_input.xml
@@ -14,87 +14,113 @@
limitations under the License.
-->
-<ScrollView
+<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <LinearLayout
- android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <ImageButton
+ style="@android:style/Widget.Material.ActionButton.Overflow"
+ android:id="@+id/more"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:padding="20dip"
- android:layout_gravity="center_horizontal">
- <TextView
- android:id="@+id/prompt"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textStyle="bold"
- android:gravity="center_horizontal"
- android:paddingBottom="30dip" />
+ android:gravity="center_horizontal"
+ android:layout_gravity="end"
+ android:visibility="gone" />
+ <ScrollView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <LinearLayout
- android:id="@+id/normal_layout"
- android:visibility="visible"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_marginLeft="10dip"
- android:layout_marginRight="10dip"
- android:layout_height="wrap_content">
- <LinearLayout
- android:id="@+id/input_restriction_info"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="4dip"
- android:orientation="horizontal">
- <TextView
- android:id="@+id/input_type"
- android:gravity="left"
- android:textColor="@color/ltgrey"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
- <TextView
- android:id="@+id/num_of_chars"
- android:textColor="@color/ltgrey"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="4dip" />
- </LinearLayout>
- <EditText
- android:id="@+id/in_text"
- android:layout_gravity="center_horizontal"
- android:layout_marginBottom="20dip"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
- <Button
- android:id="@+id/button_ok"
- android:layout_gravity="center_horizontal"
- android:layout_width="100sp"
- android:layout_height="wrap_content"
- android:textStyle="bold"
- android:text="@string/button_ok" />
- </LinearLayout>
- <LinearLayout
- android:id="@+id/yes_no_layout"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:padding="20dip"
+ android:layout_gravity="center_horizontal">
+ <ImageView
+ android:id="@+id/icon"
+ android:visibility="gone"
+ android:layout_width="@android:dimen/notification_large_icon_width"
+ android:layout_height="@android:dimen/notification_large_icon_height"
+ android:adjustViewBounds="true"
+ android:layout_gravity="center"
+ android:scaleType="fitCenter"/>
+ <TextView
+ android:id="@+id/prompt"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_horizontal">
- <Button
- android:id="@+id/button_yes"
- android:layout_width="100sp"
- android:layout_height="wrap_content"
- android:textStyle="bold"
- android:text="@string/button_yes" />
- <Button
- android:id="@+id/button_no"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="?android:attr/textColorPrimary"
+ android:gravity="center_horizontal"
+ android:paddingBottom="30dip" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <LinearLayout
+ android:id="@+id/normal_layout"
+ android:visibility="visible"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
android:layout_marginLeft="10dip"
- android:layout_width="100sp"
+ android:layout_marginRight="10dip"
+ android:layout_height="wrap_content">
+ <LinearLayout
+ android:id="@+id/input_restriction_info"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="4dip"
+ android:orientation="horizontal">
+ <TextView
+ android:id="@+id/input_type"
+ android:gravity="left"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="?android:attr/textColorSecondary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ <TextView
+ android:id="@+id/num_of_chars"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="?android:attr/textColorSecondary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="4dip" />
+ </LinearLayout>
+ <EditText
+ android:id="@+id/in_text"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="20dip"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ <Button
+ android:id="@+id/button_ok"
+ android:layout_gravity="center_horizontal"
+ android:layout_width="100sp"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:text="@string/button_ok" />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/yes_no_layout"
+ android:visibility="gone"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textStyle="bold"
- android:text="@string/button_no" />
+ android:gravity="center_horizontal">
+ <Button
+ android:id="@+id/button_yes"
+ android:layout_width="100sp"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:text="@string/button_yes" />
+ <Button
+ android:id="@+id/button_no"
+ android:layout_marginLeft="10dip"
+ android:layout_width="100sp"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:text="@string/button_no" />
+ </LinearLayout>
</LinearLayout>
</LinearLayout>
- </LinearLayout>
-</ScrollView>
+ </ScrollView>
+</LinearLayout>
diff --git a/res/layout/stk_menu_list.xml b/res/layout/stk_menu_list.xml
old mode 100644
new mode 100755
index 3872e1f..45e894d
--- a/res/layout/stk_menu_list.xml
+++ b/res/layout/stk_menu_list.xml
@@ -20,11 +20,6 @@
android:layout_height="wrap_content"
android:orientation="vertical" >
- <!-- Include stk title layout. -->
- <include
- android:id="@+id/stk_menu_title"
- layout="@layout/stk_title" />
-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/stk_msg_dialog.xml b/res/layout/stk_msg_dialog.xml
old mode 100644
new mode 100755
index 1838337..8f0c23c
--- a/res/layout/stk_msg_dialog.xml
+++ b/res/layout/stk_msg_dialog.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!-- Copyright (C) 2017 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.
@@ -14,62 +14,33 @@
limitations under the License.
-->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical" >
+ android:layout_gravity="center"
+ android:orientation="vertical">
- <LinearLayout android:id="@+id/messagePanel"
+ <ImageView
+ android:id="@+id/icon"
+ android:layout_width="@android:dimen/notification_large_icon_width"
+ android:layout_height="@android:dimen/notification_large_icon_height"
+ android:adjustViewBounds="true"
+ android:layout_gravity="center"
+ android:paddingTop="10dip"
+ android:scaleType="fitCenter"/>
+
+ <ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:orientation="vertical">
- <ScrollView android:id="@+id/scrollView"
+ android:paddingTop="2dip"
+ android:paddingBottom="12dip"
+ android:paddingStart="14dip"
+ android:paddingEnd="10dip">
+ <TextView android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:fillViewport="true"
- android:paddingTop="2dip"
- android:paddingBottom="12dip"
- android:paddingLeft="14dip"
- android:paddingRight="10dip">
- <TextView android:id="@+id/dialog_message"
- style="?android:attr/textAppearanceMedium"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="5dip" />
- </ScrollView>
- </LinearLayout>
+ android:padding="5dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
+ </ScrollView>
- <LinearLayout android:id="@+id/buttonPanel"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="54dip"
- android:orientation="vertical" >
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:background="@color/ltgrey"
- android:paddingTop="4dip"
- android:paddingLeft="2dip"
- android:paddingRight="2dip" >
- <Button
- android:id="@+id/button_cancel"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="left"
- android:layout_weight="1"
- android:maxLines="2"
- android:text="@string/button_cancel" />
- <Button
- android:id="@+id/button_ok"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:layout_weight="1"
- android:maxLines="2"
- android:text="@string/button_ok" />
- </LinearLayout>
- </LinearLayout>
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/stk_title.xml b/res/layout/stk_title.xml
old mode 100644
new mode 100755
index e63a46e..c5ca16c
--- a/res/layout/stk_title.xml
+++ b/res/layout/stk_title.xml
@@ -17,59 +17,47 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:fitsSystemWindows="true">
+ android:orientation="horizontal"
+ android:fitsSystemWindows="true">
- <LinearLayout android:id="@+id/stk_title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_centerVertical="true"
- style="?android:attr/windowTitleBackgroundStyle" >
+ <LinearLayout android:id="@+id/left_container"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_weight="1"
+ android:layout_centerVertical="true">
+ <ImageView android:id="@+id/title_icon"
+ android:visibility="gone"
+ android:layout_width="32dip"
+ android:layout_height="32dip"
+ android:layout_marginLeft="2dip"
+ android:layout_marginRight="9dip"
+ android:layout_gravity="center_vertical"
+ android:layout_alignParentLeft="true"
+ android:scaleType="fitCenter" />
- <LinearLayout android:id="@+id/left_container"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_weight="1"
- android:layout_centerVertical="true">
- <ImageView android:id="@+id/title_icon"
- android:layout_width="16dip"
- android:layout_height="16dip"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="9dip"
- android:layout_gravity="center_vertical"
- android:layout_alignParentLeft="true"
- android:scaleType="fitCenter" />
+ <TextView android:id="@+id/title_text"
+ android:gravity="center_vertical"
+ android:layout_width="match_parent"
+ android:layout_height="32dip"
+ android:ellipsize="end"
+ android:maxLines="1"
+ style="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title" />
+ </LinearLayout>
- <TextView android:id="@+id/title_text"
- android:gravity="center_vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@android:style/TextAppearance.WindowTitle" />
- </LinearLayout>
+ <LinearLayout android:id="@+id/right_container"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true">
- <LinearLayout android:id="@+id/right_container"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true">
-
- <ProgressBar android:id="@+id/progress_bar"
- style="?android:attr/progressBarStyleSmallTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="5dip"
- android:layout_centerVertical="true"
- android:visibility="gone"
- android:max="10000" />
- </LinearLayout>
- </LinearLayout>
-
- <FrameLayout android:id="@android:id/content"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:foregroundGravity="fill_horizontal|top"
- android:foreground="?android:attr/windowContentOverlay" />
+ <ProgressBar android:id="@+id/progress_bar"
+ style="?android:attr/progressBarStyleSmallTitle"
+ android:layout_width="32dip"
+ android:layout_height="32dip"
+ android:layout_marginLeft="5dip"
+ android:layout_centerVertical="true"
+ android:visibility="gone"
+ android:max="10000" />
+ </LinearLayout>
</LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 02a82b3..a588364 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Geaktiveer"</string>
<string name="disable_app" msgid="6725081975611415214">"Gedeaktiveer"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM-gereedskap"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Speeltoon"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Maak kanaal oop?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Stuur data"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Ontvang data"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mobielediensboodskappe"</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f17fead..51af5c4 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -34,6 +34,7 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"የጨዋታ ቃና"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"የተንቀሳቃሽ ስልክ አገልግሎት መልእክቶች"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 6f14843..8d981f7 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -34,6 +34,7 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"تشغيل نغمة"</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>
@@ -41,4 +42,5 @@
<string name="stk_dialog_accept" msgid="8498901537508923727">"نعم"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"لا"</string>
<string name="no_sim_card_inserted" msgid="5316620398365235988">"يُرجى إدخال شريحة SIM لتشغيل مجموعة أدوات شريحة SIM."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"رسائل خدمة الجوّال"</string>
</resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az/strings.xml
similarity index 86%
rename from res/values-az-rAZ/strings.xml
rename to res/values-az/strings.xml
index 7796b37..6e87cc2 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az/strings.xml
@@ -29,14 +29,18 @@
<string name="alphabet" msgid="1583185545938805861">"Əlifbalar"</string>
<string name="digits" msgid="1746796679021682388">"Rəqəmlər (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"Zəng davam edir..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Zəng quraşdırılır"</string>
<string name="stk_app_state" msgid="18582277302584082">"Tətbiq vəziyyəti"</string>
<string name="enable_app" msgid="3701224550936728203">"Aktivləşdirilib"</string>
<string name="disable_app" msgid="6725081975611415214">"Deaktiv"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM Toolkit"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Oxutma Tonu"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Kanal Açılsın?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Data Göndərilir"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Data Alınır"</string>
<string name="default_close_channel_msg" msgid="765364262263839824">"Kanal Bağlıdır"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"BƏLİ"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"XEYR"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"SİM Alət-panelini başlatmaq üçün SİM taxın."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mobil xidmət mesajları"</string>
</resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..bf9d00f
--- /dev/null
+++ b/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8396461461738434341">"SIM paket alatki"</string>
+ <string name="menu_end_session" msgid="7368541737750982217">"Završi sesiju"</string>
+ <string name="help" msgid="9209980881219397319">"Pomoć"</string>
+ <string name="menu_back" msgid="301227740977453364">"Nazad"</string>
+ <string name="service_name" msgid="6860303747999592491">"Naziv usluge"</string>
+ <string name="stk_no_service" msgid="5427773116839809131">"Nijedna usluga nije dostupna"</string>
+ <string name="button_ok" msgid="5760722312558549555">"Potvrdi"</string>
+ <string name="button_cancel" msgid="1997847915560800261">"Otkaži"</string>
+ <string name="button_yes" msgid="624420260648337203">"Da"</string>
+ <string name="button_no" msgid="1824959157582605627">"Ne"</string>
+ <string name="alphabet" msgid="1583185545938805861">"Abeceda"</string>
+ <string name="digits" msgid="1746796679021682388">"Cifre (0-9, *, #, +)"</string>
+ <string name="default_call_setup_msg" msgid="7960194995759849940">"Pozivanje je u toku..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Poziv se podešava"</string>
+ <string name="stk_app_state" msgid="18582277302584082">"Stanje aplikacije"</string>
+ <string name="enable_app" msgid="3701224550936728203">"Omogućeno"</string>
+ <string name="disable_app" msgid="6725081975611415214">"Onemogućeno"</string>
+ <string name="stk_dialog_title" msgid="6954825385456886726">"SIM paket alatki"</string>
+ <string name="default_open_channel_msg" msgid="2216070254100295924">"Želite li da otvorite kanal?"</string>
+ <string name="default_send_data_msg" msgid="6011219698689931272">"Slanje podataka"</string>
+ <string name="default_receive_data_msg" msgid="618096941772010682">"Primanje podataka"</string>
+ <string name="default_close_channel_msg" msgid="765364262263839824">"Kanal je zatvoren"</string>
+ <string name="stk_dialog_accept" msgid="8498901537508923727">"DA"</string>
+ <string name="stk_dialog_reject" msgid="921848059485746796">"NE"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Umetnite SIM karticu da biste pokrenuli SIM alatke."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Poruke mobilne usluge"</string>
+</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
new file mode 100644
index 0000000..c9a8bf6
--- /dev/null
+++ b/res/values-be/strings.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8396461461738434341">"Інструменты SIM"</string>
+ <string name="menu_end_session" msgid="7368541737750982217">"Скончыць сеанс"</string>
+ <string name="help" msgid="9209980881219397319">"Даведка"</string>
+ <string name="menu_back" msgid="301227740977453364">"Назад"</string>
+ <string name="service_name" msgid="6860303747999592491">"Імя службы"</string>
+ <string name="stk_no_service" msgid="5427773116839809131">"Абслугоўванне недаступна"</string>
+ <string name="button_ok" msgid="5760722312558549555">"ОК"</string>
+ <string name="button_cancel" msgid="1997847915560800261">"Скасаваць"</string>
+ <string name="button_yes" msgid="624420260648337203">"Так"</string>
+ <string name="button_no" msgid="1824959157582605627">"Не"</string>
+ <string name="alphabet" msgid="1583185545938805861">"Літары"</string>
+ <string name="digits" msgid="1746796679021682388">"Лічбы (0-9, *, #, +)"</string>
+ <string name="default_call_setup_msg" msgid="7960194995759849940">"Ідзе выклік..."</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Выклік наладжваецца"</string>
+ <string name="stk_app_state" msgid="18582277302584082">"Стан прыкладання"</string>
+ <string name="enable_app" msgid="3701224550936728203">"Уключана"</string>
+ <string name="disable_app" msgid="6725081975611415214">"Адключана"</string>
+ <string name="stk_dialog_title" msgid="6954825385456886726">"Інструменты SIM"</string>
+ <string name="default_open_channel_msg" msgid="2216070254100295924">"Адкрыты канал?"</string>
+ <string name="default_send_data_msg" msgid="6011219698689931272">"Адпраўка дадзеных"</string>
+ <string name="default_receive_data_msg" msgid="618096941772010682">"Атрыманне дадзеных"</string>
+ <string name="default_close_channel_msg" msgid="765364262263839824">"Канал закрыты"</string>
+ <string name="stk_dialog_accept" msgid="8498901537508923727">"ТАК"</string>
+ <string name="stk_dialog_reject" msgid="921848059485746796">"НЕ"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Калі ласка, устаўце SIM-карту, каб запусціць Інструменты SIM."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Паведамленні сэрвісу мабільнай перадачы даных"</string>
+</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index cc908a9..cb28e8b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -34,6 +34,7 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"Възпроизвеждана мелодия"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Съобщения за мобилни услуги"</string>
</resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn/strings.xml
similarity index 86%
rename from res/values-bn-rBD/strings.xml
rename to res/values-bn/strings.xml
index bdcbafa..bcb7b5a 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="8396461461738434341">"SIM টুলকিট"</string>
+ <string name="app_name" msgid="8396461461738434341">"সিম টুলকিট"</string>
<string name="menu_end_session" msgid="7368541737750982217">"সেশন শেষ করুন"</string>
<string name="help" msgid="9209980881219397319">"সহায়তা"</string>
<string name="menu_back" msgid="301227740977453364">"ফিরুন"</string>
@@ -33,12 +33,14 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"প্লে হওয়ার টোন"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"চ্যানেল খুলুন?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"ডেটা পাঠানো হচ্ছে"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"ডেটা গৃহীত হচ্ছে"</string>
<string name="default_close_channel_msg" msgid="765364262263839824">"চ্যানেল বন্ধ"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"হ্যাঁ"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"না"</string>
- <string name="no_sim_card_inserted" msgid="5316620398365235988">"SIM টুলকিট লঞ্চ করতে দয়া করে SIM ঢোকান৷"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"সিম টুলকিট লঞ্চ করতে দয়া করে সিম ঢোকান৷"</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"মোবাইল পরিষেবা মেসেজ"</string>
</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
new file mode 100644
index 0000000..5a8520d
--- /dev/null
+++ b/res/values-bs/strings.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8396461461738434341">"SIM Toolkit"</string>
+ <string name="menu_end_session" msgid="7368541737750982217">"Završiti sesiju"</string>
+ <string name="help" msgid="9209980881219397319">"Pomoć"</string>
+ <string name="menu_back" msgid="301227740977453364">"Nazad"</string>
+ <string name="service_name" msgid="6860303747999592491">"Ime usluge"</string>
+ <string name="stk_no_service" msgid="5427773116839809131">"Usluga nije dostupna"</string>
+ <string name="button_ok" msgid="5760722312558549555">"UREDU"</string>
+ <string name="button_cancel" msgid="1997847915560800261">"Otkaži"</string>
+ <string name="button_yes" msgid="624420260648337203">"Da"</string>
+ <string name="button_no" msgid="1824959157582605627">"Ne"</string>
+ <string name="alphabet" msgid="1583185545938805861">"Pisma"</string>
+ <string name="digits" msgid="1746796679021682388">"Znamenke (0-9, *, #, +)"</string>
+ <string name="default_call_setup_msg" msgid="7960194995759849940">"Poziv u toku"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"Poziv se uspostavlja"</string>
+ <string name="stk_app_state" msgid="18582277302584082">"Stanje aplikacije"</string>
+ <string name="enable_app" msgid="3701224550936728203">"Omogućeno"</string>
+ <string name="disable_app" msgid="6725081975611415214">"Onemogućeno"</string>
+ <string name="stk_dialog_title" msgid="6954825385456886726">"SIM ToolKit"</string>
+ <string name="default_open_channel_msg" msgid="2216070254100295924">"Otvoriti kanal?"</string>
+ <string name="default_send_data_msg" msgid="6011219698689931272">"Slanje podataka"</string>
+ <string name="default_receive_data_msg" msgid="618096941772010682">"Primanje podataka"</string>
+ <string name="default_close_channel_msg" msgid="765364262263839824">"Kanal je zatvoren"</string>
+ <string name="stk_dialog_accept" msgid="8498901537508923727">"DA"</string>
+ <string name="stk_dialog_reject" msgid="921848059485746796">"NE"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Ubacite SIM karticu kako biste pokrenuli SIM Toolkit."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Poruke mobilne usluge"</string>
+</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 3a3f888..14480fe 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Activat"</string>
<string name="disable_app" msgid="6725081975611415214">"Desactivat"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Kit d\'eines de SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"S\'està reproduint el to"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Canal obert?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Enviament de dades"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Recepció de dades"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Missatges de serveis mòbils"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b56b819..65d22b0 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Povoleno"</string>
<string name="disable_app" msgid="6725081975611415214">"Vypnuto"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Nástroje SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Přehrávání tónu"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Otevřít kanál?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Odesílání dat"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Přijímání dat"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Zprávy mobilní služby"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a997eaa..b162b3b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Aktiveret"</string>
<string name="disable_app" msgid="6725081975611415214">"Deaktiveret"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM Toolkit"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Afspilningstone"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Vil du åbne kanalen?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Sender data"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Modtager data"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Servicebeskeder på mobilen"</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index da2dc40..32ef96e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -34,11 +34,13 @@
<string name="enable_app" msgid="3701224550936728203">"Aktiviert"</string>
<string name="disable_app" msgid="6725081975611415214">"Deaktiviert"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM-ToolKit"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Ton wird abgespielt"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Kanal öffnen?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Daten senden"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Daten empfangen"</string>
<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>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Bitte lege die SIM-Karte ein, um das SIM-Toolkit zu starten."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mobilfunkdienst-Nachrichten"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ac8c4da..7e36f0e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -34,6 +34,7 @@
<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="default_tone_dialog_msg" msgid="4595366992944391641">"Αναπαραγωγή ήχου"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Μηνύματα υπηρεσίας κινητής τηλεφωνίας"</string>
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 09f577d..4c0fe00 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Enabled"</string>
<string name="disable_app" msgid="6725081975611415214">"Disabled"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM Tool Kit"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Playing tone"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Open Channel?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Sending Data"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Receiving Data"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mobile service messages"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 09f577d..4c0fe00 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Enabled"</string>
<string name="disable_app" msgid="6725081975611415214">"Disabled"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM Tool Kit"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Playing tone"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Open Channel?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Sending Data"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Receiving Data"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mobile service messages"</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 09f577d..4c0fe00 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Enabled"</string>
<string name="disable_app" msgid="6725081975611415214">"Disabled"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM Tool Kit"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Playing tone"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Open Channel?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Sending Data"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Receiving Data"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mobile service messages"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ee067c0..32c3ae3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Activado"</string>
<string name="disable_app" msgid="6725081975611415214">"Desactivado"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Kit de herramientas de la tarjeta SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Reproduciendo tono"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"¿Deseas abrir el canal?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Enviando datos"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Recibiendo datos"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mensajes de servicio móvil"</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c0a6af2..c53ed07 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Habilitado"</string>
<string name="disable_app" msgid="6725081975611415214">"Inhabilitado"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Servicios SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Tono de reproducción"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"¿Abrir canal?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Enviando datos"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Recibiendo datos"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mensajes de servicios móviles"</string>
</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et/strings.xml
similarity index 93%
rename from res/values-et-rEE/strings.xml
rename to res/values-et/strings.xml
index c88cf8c..e15102a 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Lubatud"</string>
<string name="disable_app" msgid="6725081975611415214">"Keelatud"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM-kaardi tööriistakomplekt"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Tooni esitamine"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Kas avada kanal?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Andmete saatmine"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Andmete vastuvõtmine"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mobiilsideteenuse sõnumid"</string>
</resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu/strings.xml
similarity index 93%
rename from res/values-eu-rES/strings.xml
rename to res/values-eu/strings.xml
index 3828ca1..16aa98b 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Gaituta"</string>
<string name="disable_app" msgid="6725081975611415214">"Desgaituta"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM tresna sorta"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Jokoaren tonua"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Kanala ireki?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Datuak bidaltzen"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Datuak jasotzen"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Zerbitzu mugikorraren mezuak"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 9eaa00e..8a947d2 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/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">"کیت ابزار سیم کارت"</string>
+ <string name="app_name" msgid="8396461461738434341">"ابزار کار SIM"</string>
<string name="menu_end_session" msgid="7368541737750982217">"پایان جلسه"</string>
<string name="help" msgid="9209980881219397319">"راهنمایی"</string>
<string name="menu_back" msgid="301227740977453364">"برگشت"</string>
@@ -29,16 +29,18 @@
<string name="alphabet" msgid="1583185545938805861">"الفبا"</string>
<string name="digits" msgid="1746796679021682388">"ارقام (0-9، *، #، +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"تماس در حال انجام..."</string>
- <string name="default_setup_call_msg" msgid="6126904475461162162">"تماس در حال تنظیم"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"تماس درحال راهاندازی"</string>
<string name="stk_app_state" msgid="18582277302584082">"حالت برنامه"</string>
<string name="enable_app" msgid="3701224550936728203">"فعال شد"</string>
<string name="disable_app" msgid="6725081975611415214">"غیرفعال شد"</string>
- <string name="stk_dialog_title" msgid="6954825385456886726">"کیت ابزار سیم کارت"</string>
+ <string name="stk_dialog_title" msgid="6954825385456886726">"ابزار کار SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"درحال پخش ملودی"</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 Toolkit، لطفاً سیمکارت را وارد کنید."</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"برای راهاندازی ابزار کار SIM، لطفاً سیمکارت را وارد کنید."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"پیامهای سرویس دستگاه همراه"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 13b3590..235bd00 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Käytössä"</string>
<string name="disable_app" msgid="6725081975611415214">"Pois käytöstä"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM Toolkit"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Peliääni"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Avoin kanava?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Lähetetään tietoja"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Vastaanotetaan tietoja"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mobiilipalveluviestit"</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 461c67b..7adb5c2 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Activé"</string>
<string name="disable_app" msgid="6725081975611415214">"Désactivé"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Boîte à outils SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Lecture de la sonnerie"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Ouvrir le canal?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Envoi de données en cours…"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Réception de données en cours…"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Messages des services mobiles"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6d08f78..c5797f1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Activé"</string>
<string name="disable_app" msgid="6725081975611415214">"Désactivé"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Boîte à outils SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Lecture de la sonnerie"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Ouvrir le canal ?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Envoi de données en cours…"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Réception de données en cours…"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Messages du service mobile"</string>
</resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl/strings.xml
similarity index 93%
rename from res/values-gl-rES/strings.xml
rename to res/values-gl/strings.xml
index 02149c4..fab8f59 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Activado"</string>
<string name="disable_app" msgid="6725081975611415214">"Desactivada"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Kit de ferramentas da tarxeta SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Reproducindo ton"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Abrir a canle?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Enviando datos"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Recibindo datos"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mensaxes do servizo para móbiles"</string>
</resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu/strings.xml
similarity index 83%
rename from res/values-gu-rIN/strings.xml
rename to res/values-gu/strings.xml
index bb1750c..ed945ed 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu/strings.xml
@@ -16,13 +16,13 @@
<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>
<string name="service_name" msgid="6860303747999592491">"સેવાનું નામ"</string>
<string name="stk_no_service" msgid="5427773116839809131">"કોઈ સેવા ઉપલબ્ધ નથી"</string>
- <string name="button_ok" msgid="5760722312558549555">"ઑકે"</string>
+ <string name="button_ok" msgid="5760722312558549555">"ઓકે"</string>
<string name="button_cancel" msgid="1997847915560800261">"રદ કરો"</string>
<string name="button_yes" msgid="624420260648337203">"હા"</string>
<string name="button_no" msgid="1824959157582605627">"નહીં"</string>
@@ -33,12 +33,14 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"ચલાવવા માટેનો ટોન"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"ચૅનલ ખોલીએ?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"ડેટા મોકલી રહ્યું છે"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"ડેટા પ્રાપ્ત કરી રહ્યું છે"</string>
<string name="default_close_channel_msg" msgid="765364262263839824">"ચૅનલ બંધ છે"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"હા"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"નહીં"</string>
- <string name="no_sim_card_inserted" msgid="5316620398365235988">"કૃપા કરીને SIM ટૂલકિટ લોન્ચ કરવા માટે SIM શામેલ કરો."</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"કૃપા કરીને સિમ ટૂલકિટ લોન્ચ કરવા માટે સિમ શામેલ કરો."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"મોબાઇલ સેવાના સંદેશા"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ffd5596..5b38f4b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -23,7 +23,7 @@
<string name="service_name" msgid="6860303747999592491">"सेवा का नाम"</string>
<string name="stk_no_service" msgid="5427773116839809131">"कोई सेवा उपलब्ध नहीं"</string>
<string name="button_ok" msgid="5760722312558549555">"ठीक है"</string>
- <string name="button_cancel" msgid="1997847915560800261">"अभी नहीं"</string>
+ <string name="button_cancel" msgid="1997847915560800261">"रद्द करें"</string>
<string name="button_yes" msgid="624420260648337203">"हां"</string>
<string name="button_no" msgid="1824959157582605627">"नहीं"</string>
<string name="alphabet" msgid="1583185545938805861">"अक्षर"</string>
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"सक्षम की गई"</string>
<string name="disable_app" msgid="6725081975611415214">"अक्षम की गई"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"सिम टूलकिट"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"टोन बजाया जा रहा है"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"मोबाइल सेवा संदेश"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 6802bf1..81b4243 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Omogućeno"</string>
<string name="disable_app" msgid="6725081975611415214">"Onemogućeno"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Komplet alata za SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Reprodukcija zvuka"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Otvoriti kanal?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Slanje podataka"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Primanje podataka"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Poruke mobilnih usluga"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 92a504a..9c7c290 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Engedélyezve"</string>
<string name="disable_app" msgid="6725081975611415214">"Letiltva"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM kártya eszközkészlete"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Playing Tone"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Megnyitja a csatornát?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Adatok küldése"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Adatok fogadása"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mobilszolgáltatási üzenetek"</string>
</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy/strings.xml
similarity index 90%
rename from res/values-hy-rAM/strings.xml
rename to res/values-hy/strings.xml
index 9e532f7..6ba73eb 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy/strings.xml
@@ -22,7 +22,7 @@
<string name="menu_back" msgid="301227740977453364">"Հետ"</string>
<string name="service_name" msgid="6860303747999592491">"Ծառայության անվանումը"</string>
<string name="stk_no_service" msgid="5427773116839809131">"Ծառայությունն անհասանելի է"</string>
- <string name="button_ok" msgid="5760722312558549555">"Լավ"</string>
+ <string name="button_ok" msgid="5760722312558549555">"Հաստատել"</string>
<string name="button_cancel" msgid="1997847915560800261">"Չեղարկել"</string>
<string name="button_yes" msgid="624420260648337203">"Այո"</string>
<string name="button_no" msgid="1824959157582605627">"Ոչ"</string>
@@ -34,6 +34,7 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"Նվագարկման տոն"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Բջջային ծառայության հաղորդագրություններ"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index bd0c1e1..e6872eb 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Diaktifkan"</string>
<string name="disable_app" msgid="6725081975611415214">"Dinonaktifkan"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM ToolKit"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Memutar Nada"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Buka Saluran?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Mengirim Data"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Menerima Data"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Pesan layanan seluler"</string>
</resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is/strings.xml
similarity index 93%
rename from res/values-is-rIS/strings.xml
rename to res/values-is/strings.xml
index 6e35ca5..8348585 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Virkt"</string>
<string name="disable_app" msgid="6725081975611415214">"Óvirkt"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM-verkfæri"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Spilar tón"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Opna rás?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Sendir gögn"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Tekur á móti gögnum"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Skilaboð farsímaþjónustu"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ef94ae5..dc88a48 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Attivato"</string>
<string name="disable_app" msgid="6725081975611415214">"Disattivato"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Kit strumenti SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Tono in riproduzione"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Aprire il canale?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Invio dati"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Ricezione dati"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Messaggi del servizio dati mobile"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index a763ee1..dca16ba 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -34,6 +34,7 @@
<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="default_tone_dialog_msg" msgid="4595366992944391641">"צליל הפעלה"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"הודעות שירות סלולרי"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b74d59a..1dfaa7e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -34,6 +34,7 @@
<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="default_tone_dialog_msg" msgid="4595366992944391641">"再生音"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"モバイル サービス メッセージ"</string>
</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka/strings.xml
similarity index 92%
rename from res/values-ka-rGE/strings.xml
rename to res/values-ka/strings.xml
index 5127716..14e97ac 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka/strings.xml
@@ -34,6 +34,7 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"ტონის დაკვრა"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"მობილური სერვისის შეტყობინებები"</string>
</resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk/strings.xml
similarity index 93%
rename from res/values-kk-rKZ/strings.xml
rename to res/values-kk/strings.xml
index 33f85b1..c030ff5 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk/strings.xml
@@ -34,6 +34,7 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"Әуенді ойнату"</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>
@@ -41,4 +42,5 @@
<string name="stk_dialog_accept" msgid="8498901537508923727">"ИӘ"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"ЖОҚ"</string>
<string name="no_sim_card_inserted" msgid="5316620398365235988">"SIM құралдар тақтасын іске қосу үшін SIM картасын салыңыз."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Мобильдік қызмет хабарлары"</string>
</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km/strings.xml
similarity index 92%
rename from res/values-km-rKH/strings.xml
rename to res/values-km/strings.xml
index 8ecf5ee..399d4a0 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"បានបើក"</string>
<string name="disable_app" msgid="6725081975611415214">"បានបិទ"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"ប្រអប់ឧបករណ៍ស៊ីម"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"ចាក់សំឡេងរោទ៍"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"សារសេវាកម្មឧបករណ៍ចល័ត"</string>
</resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn/strings.xml
similarity index 91%
rename from res/values-kn-rIN/strings.xml
rename to res/values-kn/strings.xml
index 25f760b..d9eff90 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn/strings.xml
@@ -23,7 +23,7 @@
<string name="service_name" msgid="6860303747999592491">"ಸೇವೆಯ ಹೆಸರು"</string>
<string name="stk_no_service" msgid="5427773116839809131">"ಯಾವುದೇ ಸೇವೆ ಲಭ್ಯವಿಲ್ಲ"</string>
<string name="button_ok" msgid="5760722312558549555">"ಸರಿ"</string>
- <string name="button_cancel" msgid="1997847915560800261">"ರದ್ದುಮಾಡು"</string>
+ <string name="button_cancel" msgid="1997847915560800261">"ರದ್ದುಮಾಡಿ"</string>
<string name="button_yes" msgid="624420260648337203">"ಹೌದು"</string>
<string name="button_no" msgid="1824959157582605627">"ಇಲ್ಲ"</string>
<string name="alphabet" msgid="1583185545938805861">"ವರ್ಣಮಾಲೆಗಳು"</string>
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
<string name="disable_app" msgid="6725081975611415214">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"ಸಿಮ್ ಟೂಲ್ಕಿಟ್"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"ಟೋನ್ ಪ್ಲೇ ಮಾಡಲಾಗುತ್ತಿದೆ"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"ಮೊಬೈಲ್ ಸೇವಾ ಸಂದೇಶಗಳು"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d777e48..d5acc18 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -18,7 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="8396461461738434341">"SIM 툴킷"</string>
<string name="menu_end_session" msgid="7368541737750982217">"세션 끝내기"</string>
- <string name="help" msgid="9209980881219397319">"도움말"</string>
+ <string name="help" msgid="9209980881219397319">"고객센터"</string>
<string name="menu_back" msgid="301227740977453364">"뒤로"</string>
<string name="service_name" msgid="6860303747999592491">"서비스 이름"</string>
<string name="stk_no_service" msgid="5427773116839809131">"서비스를 사용할 수 없음"</string>
@@ -34,6 +34,7 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"알림음 재생 중"</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>
@@ -41,4 +42,5 @@
<string name="stk_dialog_accept" msgid="8498901537508923727">"예"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"아니요"</string>
<string name="no_sim_card_inserted" msgid="5316620398365235988">"SIM 툴킷을 실행하려면 SIM을 삽입하세요."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"모바일 서비스 메시지"</string>
</resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky/strings.xml
similarity index 92%
rename from res/values-ky-rKG/strings.xml
rename to res/values-ky/strings.xml
index 95acccf..04147d7 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky/strings.xml
@@ -34,6 +34,7 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"Ойноо добушу"</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>
@@ -41,4 +42,5 @@
<string name="stk_dialog_accept" msgid="8498901537508923727">"ООБА"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"ЖОК"</string>
<string name="no_sim_card_inserted" msgid="5316620398365235988">"SIM Куралдар кутусун жүргүзүү үчүн SIM салыңыз."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Мобилдик Интернет кызматынын билдирүүлөрү"</string>
</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo/strings.xml
similarity index 93%
rename from res/values-lo-rLA/strings.xml
rename to res/values-lo/strings.xml
index 69a0d05..5bb6e64 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo/strings.xml
@@ -34,6 +34,7 @@
<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="default_tone_dialog_msg" msgid="4595366992944391641">"ກຳລັງຫຼິ້ນໂທນ"</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>
@@ -41,4 +42,5 @@
<string name="stk_dialog_accept" msgid="8498901537508923727">"ຕົກລົງ"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"ບໍ່"</string>
<string name="no_sim_card_inserted" msgid="5316620398365235988">"ກະລຸນາສຽບ SIM ເພື່ອເປີດໃຊ້ຊຸດເຄື່ອງມື SIM."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"ຂໍ້ຄວາມບໍລິການມືຖື"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 9e04a46..8b92ce5 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Įgalinta"</string>
<string name="disable_app" msgid="6725081975611415214">"Išjungta"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM įrankių komplektas"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Leidžiamas tonas"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Atidaryti kanalą?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Siunčiami duomenys"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Gaunami duomenys"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mobiliojo ryšio paslaugos pranešimai"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 6ea916b..142c1da 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Iespējots"</string>
<string name="disable_app" msgid="6725081975611415214">"Atspējots"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM rīkkopa"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Signāla atskaņošana"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Vai atvērt kanālu?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Notiek datu sūtīšana"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Notiek datu saņemšana"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mobilā pakalpojuma ziņojumi"</string>
</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk/strings.xml
similarity index 88%
rename from res/values-mk-rMK/strings.xml
rename to res/values-mk/strings.xml
index 328236b..8ade55f 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk/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">"Алатник на СИМ"</string>
+ <string name="app_name" msgid="8396461461738434341">"Алатник на SIM"</string>
<string name="menu_end_session" msgid="7368541737750982217">"Заврши сесија"</string>
<string name="help" msgid="9209980881219397319">"Помош"</string>
<string name="menu_back" msgid="301227740977453364">"Назад"</string>
@@ -33,12 +33,14 @@
<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">"Алатник на СИМ"</string>
+ <string name="stk_dialog_title" msgid="6954825385456886726">"Алатник на SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Се пушта звук"</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>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"Вметнете SIM за да го активирате Алатникот на SIM."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Пораки за мобилна услуга"</string>
</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml/strings.xml
similarity index 92%
rename from res/values-ml-rIN/strings.xml
rename to res/values-ml/strings.xml
index be70469..b0a5440 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"പ്രവർത്തനക്ഷമമാക്കി"</string>
<string name="disable_app" msgid="6725081975611415214">"പ്രവർത്തനരഹിതമാക്കി"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"സിം ToolKit"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"ശബ്ദം പ്ലേചെയ്യുന്നു"</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>
@@ -41,4 +42,5 @@
<string name="stk_dialog_accept" msgid="8498901537508923727">"അതെ"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"അല്ല"</string>
<string name="no_sim_card_inserted" msgid="5316620398365235988">"SIM ടൂൾക്കിറ്റ് സമാരംഭിക്കാൻ SIM ചേർക്കുക."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"മൊബൈൽ സേവന സന്ദേശങ്ങൾ"</string>
</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn/strings.xml
similarity index 90%
rename from res/values-mn-rMN/strings.xml
rename to res/values-mn/strings.xml
index fa58f0e..e9dc3f7 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn/strings.xml
@@ -22,7 +22,7 @@
<string name="menu_back" msgid="301227740977453364">"Буцах"</string>
<string name="service_name" msgid="6860303747999592491">"Үйлчилгээний нэр"</string>
<string name="stk_no_service" msgid="5427773116839809131">"Ашиглах боломжтой үйлчилгээ байхгүй"</string>
- <string name="button_ok" msgid="5760722312558549555">"Тийм"</string>
+ <string name="button_ok" msgid="5760722312558549555">"OK"</string>
<string name="button_cancel" msgid="1997847915560800261">"Цуцлах"</string>
<string name="button_yes" msgid="624420260648337203">"Тийм"</string>
<string name="button_no" msgid="1824959157582605627">"Үгүй"</string>
@@ -34,6 +34,7 @@
<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="default_tone_dialog_msg" msgid="4595366992944391641">"Дууг тоглуулж байна"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Мобайл үйлчилгээний зурвас"</string>
</resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr/strings.xml
similarity index 91%
rename from res/values-mr-rIN/strings.xml
rename to res/values-mr/strings.xml
index 00e5870..8274460 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr/strings.xml
@@ -30,10 +30,11 @@
<string name="digits" msgid="1746796679021682388">"अंक (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"कॉल प्रगतीवर आहे…"</string>
<string name="default_setup_call_msg" msgid="6126904475461162162">"कॉल सेट केला जात आहे"</string>
- <string name="stk_app_state" msgid="18582277302584082">"अनुप्रयोग स्थिती"</string>
+ <string name="stk_app_state" msgid="18582277302584082">"अॅप्लिकेशन स्थिती"</string>
<string name="enable_app" msgid="3701224550936728203">"सक्षम केले"</string>
<string name="disable_app" msgid="6725081975611415214">"अक्षम केले"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"सिम टूलकिट"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"टोन चालवत आहे"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"मोबाइल सेवा संदेश"</string>
</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms/strings.xml
similarity index 93%
rename from res/values-ms-rMY/strings.xml
rename to res/values-ms/strings.xml
index 0f14a6c..1df54fa 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Didayakan"</string>
<string name="disable_app" msgid="6725081975611415214">"Dilumpuhkan"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM Toolkit"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Memainkan Nada"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Buka Saluran?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Menghantar Data"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Menerima Data"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mesej perkhidmatan mudah alih"</string>
</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my/strings.xml
similarity index 83%
rename from res/values-my-rMM/strings.xml
rename to res/values-my/strings.xml
index e66a882..192cbc8 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my/strings.xml
@@ -19,21 +19,22 @@
<string name="app_name" msgid="8396461461738434341">"SIM တူးလ်ကစ်"</string>
<string name="menu_end_session" msgid="7368541737750982217">"သတ်မှတ်ကဏ္ဏကို ပြီးဆုံးမည်"</string>
<string name="help" msgid="9209980881219397319">"အကူအညီ"</string>
- <string name="menu_back" msgid="301227740977453364">"နောက်ပြန်"</string>
+ <string name="menu_back" msgid="301227740977453364">"နောက်သို့"</string>
<string name="service_name" msgid="6860303747999592491">"ဝန်ဆောင်မှုအမည်"</string>
<string name="stk_no_service" msgid="5427773116839809131">"ဆက်သွယ်ချိတ်ဆက်ရန် ဝန်ဆောင်မှု တစ်ခုမှမရှိပါ"</string>
- <string name="button_ok" msgid="5760722312558549555">"ကောင်းပြီ"</string>
- <string name="button_cancel" msgid="1997847915560800261">"ထားတော့"</string>
- <string name="button_yes" msgid="624420260648337203">"မှန်ပါသည်"</string>
- <string name="button_no" msgid="1824959157582605627">"မဟုတ်ပါ"</string>
+ <string name="button_ok" msgid="5760722312558549555">"အိုကေ"</string>
+ <string name="button_cancel" msgid="1997847915560800261">"မလုပ်တော့"</string>
+ <string name="button_yes" msgid="624420260648337203">"Yes"</string>
+ <string name="button_no" msgid="1824959157582605627">"No"</string>
<string name="alphabet" msgid="1583185545938805861">"အက္ခရာများ"</string>
<string name="digits" msgid="1746796679021682388">"ဂဏန်းများ (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"ခေါ်ဆိုနေပါသည်"</string>
<string name="default_setup_call_msg" msgid="6126904475461162162">"ခေါ်ဆိုရန် သတ်မှတ်ပြင်ဆင်ပြီး"</string>
- <string name="stk_app_state" msgid="18582277302584082">"အပ်ပလီကေးရှင်းအနေအထား"</string>
+ <string name="stk_app_state" msgid="18582277302584082">"အပလီကေးရှင်းအနေအထား"</string>
<string name="enable_app" msgid="3701224550936728203">"ဖွင့်ထားသည်"</string>
<string name="disable_app" msgid="6725081975611415214">"သုံးမရအောင် ပိတ်ထားခြင်း"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM တူးလ်ကစ်"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"ဖွင့်ထားသည့် အသံ"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"မိုဘိုင်းဝန်ဆောင်မှု မက်ဆေ့ဂျ်များ"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index e4a7488..84fa118 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Aktivert"</string>
<string name="disable_app" msgid="6725081975611415214">"Slått av"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Verktøykasse for SIM-kort"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Spiller av Tone"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Åpen kanal?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Sending av data"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Mottak av data"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mobiltjenestemeldinger"</string>
</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne/strings.xml
similarity index 92%
rename from res/values-ne-rNP/strings.xml
rename to res/values-ne/strings.xml
index 2f42cd4..ff1aa67 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne/strings.xml
@@ -34,6 +34,7 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"बजिरहेको टोन"</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>
@@ -41,4 +42,5 @@
<string name="stk_dialog_accept" msgid="8498901537508923727">"हो"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"होइन"</string>
<string name="no_sim_card_inserted" msgid="5316620398365235988">"SIM टुलकिट लञ्च गर्न कृपया SIM घुसाउनुहोस्।"</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"मोबाइल सेवाका सन्देशहरू"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ee095bd..9d34917 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Ingeschakeld"</string>
<string name="disable_app" msgid="6725081975611415214">"Uitgeschakeld"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM-toolkit"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Toon afspelen"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Kanaal openen?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Gegevens verzenden"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Gegevens ontvangen"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mobiele serviceberichten"</string>
</resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa/strings.xml
similarity index 79%
rename from res/values-pa-rIN/strings.xml
rename to res/values-pa/strings.xml
index 240e175..31d7972 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa/strings.xml
@@ -17,8 +17,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="8396461461738434341">"SIM Toolkit"</string>
- <string name="menu_end_session" msgid="7368541737750982217">"ਸੈਸ਼ਨ ਖ਼ਤਮ ਕਰੋ"</string>
- <string name="help" msgid="9209980881219397319">"ਸਹਾਇਤਾ"</string>
+ <string name="menu_end_session" msgid="7368541737750982217">"ਸੈਸ਼ਨ ਸਮਾਪਤ ਕਰੋ"</string>
+ <string name="help" msgid="9209980881219397319">"ਮਦਦ"</string>
<string name="menu_back" msgid="301227740977453364">"ਪਿੱਛੇ"</string>
<string name="service_name" msgid="6860303747999592491">"ਸੇਵਾ ਦਾ ਨਾਮ"</string>
<string name="stk_no_service" msgid="5427773116839809131">"ਕੋਈ ਸੇਵਾ ਉਪਲਬਧ ਨਹੀਂ"</string>
@@ -29,16 +29,18 @@
<string name="alphabet" msgid="1583185545938805861">"ਵਰਨਮਾਲਾ"</string>
<string name="digits" msgid="1746796679021682388">"ਅੰਕ (0-9, *, #, +)"</string>
<string name="default_call_setup_msg" msgid="7960194995759849940">"ਕਾਲ ਪ੍ਰਗਤੀ ਵਿੱਚ ਹੈ…"</string>
- <string name="default_setup_call_msg" msgid="6126904475461162162">"ਕਾਲ ਸੈਟਅਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
+ <string name="default_setup_call_msg" msgid="6126904475461162162">"ਕਾਲ ਸੈੱਟਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
<string name="stk_app_state" msgid="18582277302584082">"ਐਪਲੀਕੇਸ਼ਨ ਸਥਿਤੀ"</string>
<string name="enable_app" msgid="3701224550936728203">"ਸਮਰੱਥ ਬਣਾਇਆ"</string>
- <string name="disable_app" msgid="6725081975611415214">"ਅਸਮਰੱਥ ਬਣਾਇਆ"</string>
+ <string name="disable_app" msgid="6725081975611415214">"ਅਯੋਗ ਬਣਾਇਆ"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM ToolKit"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"ਧੁਨੀ ਵੱਜ ਰਹੀ ਹੈ"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"ਕੀ ਚੈਨਲ ਖੋਲ੍ਹਣਾ ਹੈ?"</string>
- <string name="default_send_data_msg" msgid="6011219698689931272">"ਡਾਟਾ ਭੇਜ ਰਿਹਾ ਹੈ"</string>
- <string name="default_receive_data_msg" msgid="618096941772010682">"ਡਾਟਾ ਪ੍ਰਾਪਤ ਕਰ ਰਿਹਾ ਹੈ"</string>
+ <string name="default_send_data_msg" msgid="6011219698689931272">" ਡਾਟਾ ਭੇਜ ਰਿਹਾ ਹੈ"</string>
+ <string name="default_receive_data_msg" msgid="618096941772010682">" ਡਾਟਾ ਪ੍ਰਾਪਤ ਕਰ ਰਿਹਾ ਹੈ"</string>
<string name="default_close_channel_msg" msgid="765364262263839824">"ਚੈਨਲ ਬੰਦ ਕੀਤਾ"</string>
<string name="stk_dialog_accept" msgid="8498901537508923727">"ਹਾਂ"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"ਨਹੀਂ"</string>
- <string name="no_sim_card_inserted" msgid="5316620398365235988">"ਕਿਰਪਾ ਕਰਕੇ SIM Toolkit ਲੌਂਚ ਕਰਨ ਲਈ SIM ਪਾਓ।"</string>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"ਕਿਰਪਾ ਕਰਕੇ ਸਿਮ ਟੂਲਕਿੱਟ ਲਾਂਚ ਕਰਨ ਲਈ ਸਿਮ ਪਾਓ।"</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"ਮੋਬਾਈਲ ਸੇਵਾ ਸੁਨੇਹੇ"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5cb4a2c..cb52733 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Włączone"</string>
<string name="disable_app" msgid="6725081975611415214">"Wyłączone"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Zestaw narzędzi SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Odtwarzanie dźwięku"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Otwarty kanał?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Wysyłanie danych"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Odbieranie danych"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Komunikaty usługi mobilnej"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9801d72..418cf53 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Ativado"</string>
<string name="disable_app" msgid="6725081975611415214">"Desativado"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Toolkit SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Tom de reprodução"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Abrir Canal?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"A Enviar Dados"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"A Receber Dados"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mensagens do serviço móvel"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0cc5296..1cd5f21 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -34,6 +34,7 @@
<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>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Reproduzindo tom"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Abrir canal?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Enviando dados"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Recebendo dados"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mensagens de serviço móvel"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1e56049..289cf92 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -17,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="8396461461738434341">"SIM Toolkit"</string>
- <string name="menu_end_session" msgid="7368541737750982217">"Sfârşitul sesiunii"</string>
+ <string name="menu_end_session" msgid="7368541737750982217">"Sfârșitul sesiunii"</string>
<string name="help" msgid="9209980881219397319">"Ajutor"</string>
<string name="menu_back" msgid="301227740977453364">"Înapoi"</string>
<string name="service_name" msgid="6860303747999592491">"Nume serviciu"</string>
@@ -34,11 +34,13 @@
<string name="enable_app" msgid="3701224550936728203">"Activat"</string>
<string name="disable_app" msgid="6725081975611415214">"Dezactivat"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM Toolkit"</string>
- <string name="default_open_channel_msg" msgid="2216070254100295924">"Deschideţi canalul?"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Ton de redare"</string>
+ <string name="default_open_channel_msg" msgid="2216070254100295924">"Deschideți canalul?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Se trimit date"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Se primesc date"</string>
<string name="default_close_channel_msg" msgid="765364262263839824">"Canal închis"</string>
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mesaje privind serviciul mobil"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8a791b3..7204a69 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -34,6 +34,7 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"Воспроизведение сигнала"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Сообщения мобильных сервисов"</string>
</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si/strings.xml
similarity index 93%
rename from res/values-si-rLK/strings.xml
rename to res/values-si/strings.xml
index 64330ef..419534b 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si/strings.xml
@@ -34,6 +34,7 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"නාද වන රිද්මය"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"ජංගම සේවා පණිවිඩ"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7975f84..f8eb2dc 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -32,8 +32,9 @@
<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>
+ <string name="disable_app" msgid="6725081975611415214">"Vypnuté"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Nástroje SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Prehráva sa tón"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Otvoriť kanál?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Prebieha odosielanie údajov"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Prebieha získavanie údajov"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Správy mobilnej služby"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 13f4df3..70eb72d 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -34,6 +34,7 @@
<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>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Predvajanje tona"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Želite odpreti kanal?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Pošiljanje podatkov"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Sprejemanje podatkov"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Sporočila mobilne storitve"</string>
</resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq/strings.xml
similarity index 93%
rename from res/values-sq-rAL/strings.xml
rename to res/values-sq/strings.xml
index 71846a2..e071921 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq/strings.xml
@@ -22,7 +22,7 @@
<string name="menu_back" msgid="301227740977453364">"Prapa"</string>
<string name="service_name" msgid="6860303747999592491">"Emri i shërbimit"</string>
<string name="stk_no_service" msgid="5427773116839809131">"Nuk ofrohet asnjë shërbim"</string>
- <string name="button_ok" msgid="5760722312558549555">"Në rregull!"</string>
+ <string name="button_ok" msgid="5760722312558549555">"Në rregull"</string>
<string name="button_cancel" msgid="1997847915560800261">"Anulo"</string>
<string name="button_yes" msgid="624420260648337203">"Po"</string>
<string name="button_no" msgid="1824959157582605627">"Jo"</string>
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Aktivizuar"</string>
<string name="disable_app" msgid="6725081975611415214">"Çaktivizuar"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Kutia e veglave e kartës SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Toni i luajtjes"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Të hapet kanali?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Po dërgon të dhëna"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Po merr të dhëna"</string>
@@ -41,4 +42,5 @@
<string name="stk_dialog_accept" msgid="8498901537508923727">"PO"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"JO"</string>
<string name="no_sim_card_inserted" msgid="5316620398365235988">"Vendos kartën SIM për të hapur \"Kutinë e veglave\"."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mesazhet e shërbimit celular"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c9fea5c..0438132 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -34,6 +34,7 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"Звук се репродукује"</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>
@@ -41,4 +42,5 @@
<string name="stk_dialog_accept" msgid="8498901537508923727">"ДА"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"НЕ"</string>
<string name="no_sim_card_inserted" msgid="5316620398365235988">"Уметните SIM картицу да бисте покренули SIM алатке."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Поруке мобилне услуге"</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 90a31e3..51ae32b 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Har aktiverats"</string>
<string name="disable_app" msgid="6725081975611415214">"Har inaktiverats"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM-verktyg"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Spelar upp ton"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Öppen kanal?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Skicka data"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Ta emot data"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mobiltjänstmeddelanden"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d0ddf43..12b0c55 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Imewezeshwa"</string>
<string name="disable_app" msgid="6725081975611415214">"Imelemazwa"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Zana za SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Sauti ya Kucheza"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Kituo Huria?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Inatuma Data"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Inapokea Data"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Ujumbe wa huduma za vifaa vya mkononi"</string>
</resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta/strings.xml
similarity index 92%
rename from res/values-ta-rIN/strings.xml
rename to res/values-ta/strings.xml
index 316d1df..01eb52f 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"இயக்கப்பட்டது"</string>
<string name="disable_app" msgid="6725081975611415214">"முடக்கப்பட்டது"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"சிம் கருவிப்பெட்டி"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"டோனை இயக்குகிறது"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"மொபைல் சேவை செய்திகள்"</string>
</resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te/strings.xml
similarity index 93%
rename from res/values-te-rIN/strings.xml
rename to res/values-te/strings.xml
index 6fdfe08..7612227 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"ప్రారంభించబడింది"</string>
<string name="disable_app" msgid="6725081975611415214">"నిలిపివేయబడింది"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"సిమ్ టూల్కిట్"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"టోన్ ప్లే అవుతోంది"</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>
@@ -41,4 +42,5 @@
<string name="stk_dialog_accept" msgid="8498901537508923727">"అవును"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"వద్దు"</string>
<string name="no_sim_card_inserted" msgid="5316620398365235988">"దయచేసి SIM టూల్కిట్ని ప్రారంభించడానికి SIMని చేర్చండి."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"మొబైల్ సేవ సందేశాలు"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 478bdfa..22998ab 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -34,6 +34,7 @@
<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="default_tone_dialog_msg" msgid="4595366992944391641">"กำลังเล่นเสียง"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"ข้อความบริการอุปกรณ์เคลื่อนที่"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index fcd711a..d64cccb 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Pinagana"</string>
<string name="disable_app" msgid="6725081975611415214">"Hindi pinagana"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM Toolkit"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Nagpe-play na Tone"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Buksan ang Channel?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Nagpapadala ng Data"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Tumatanggap ng Data"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mga mensahe ng serbisyo sa mobile"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 6088c43..72f039f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Etkin"</string>
<string name="disable_app" msgid="6725081975611415214">"Devre dışı"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"SIM Araç Seti"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Ses Çalınıyor"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Kanal Açılsın mı?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Veri Gönderiliyor"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Veri Alınıyor"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mobil hizmet mesajları"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f7455f3..c702f2c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -34,6 +34,7 @@
<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="default_tone_dialog_msg" msgid="4595366992944391641">"Відтворення сигналу"</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>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Повідомлення з мобільних служб"</string>
</resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur/strings.xml
similarity index 93%
rename from res/values-ur-rPK/strings.xml
rename to res/values-ur/strings.xml
index 3356542..a062307 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur/strings.xml
@@ -34,6 +34,7 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"ٹون چل رہی ہے"</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>
@@ -41,4 +42,5 @@
<string name="stk_dialog_accept" msgid="8498901537508923727">"ہاں"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"نہیں"</string>
<string name="no_sim_card_inserted" msgid="5316620398365235988">"براہ کرم SIM ٹول کٹ لانچ کرنے کیلئے SIM داخل کریں۔"</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"موبائل سروس کے پیغامات"</string>
</resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz/strings.xml
similarity index 88%
rename from res/values-uz-rUZ/strings.xml
rename to res/values-uz/strings.xml
index e00596b..40eab69 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="8396461461738434341">"SIM vositalar majmuasi"</string>
+ <string name="app_name" msgid="8396461461738434341">"SIM karta menyusi"</string>
<string name="menu_end_session" msgid="7368541737750982217">"Sessiyani yakunlash"</string>
<string name="help" msgid="9209980881219397319">"Yordam"</string>
<string name="menu_back" msgid="301227740977453364">"Orqaga"</string>
@@ -33,12 +33,14 @@
<string name="stk_app_state" msgid="18582277302584082">"Ilova holati"</string>
<string name="enable_app" msgid="3701224550936728203">"Yoniq"</string>
<string name="disable_app" msgid="6725081975611415214">"O‘chiq"</string>
- <string name="stk_dialog_title" msgid="6954825385456886726">"SIM vositalar majmuasi"</string>
+ <string name="stk_dialog_title" msgid="6954825385456886726">"SIM karta menyusi"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Signal ijrosi"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Kanal ochilsinmi?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Ma’lumot yuborilmoqda"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Ma’lumot qabul qilinmoqda"</string>
<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>
+ <string name="no_sim_card_inserted" msgid="5316620398365235988">"SIM karta menyusini ochish uchun SIM kartani soling."</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Mobil xizmat xabarlari"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 3f3ebaf..0e0b9fa 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Đã bật"</string>
<string name="disable_app" msgid="6725081975611415214">"Đã vô hiệu hóa"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Bộ công cụ SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Phát âm thanh"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Mở kênh?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Đang gửi dữ liệu"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Đang nhận dữ liệu"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Thông báo dịch vụ di động"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b765f57..59db8c4 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -34,6 +34,7 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"正在播放音效"</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>
@@ -41,4 +42,5 @@
<string name="stk_dialog_accept" msgid="8498901537508923727">"是"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"否"</string>
<string name="no_sim_card_inserted" msgid="5316620398365235988">"请插入 SIM 卡以启动 SIM 卡工具包。"</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"移动服务消息"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index f949087..5a2ebd9 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -34,6 +34,7 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"正在播放音效"</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>
@@ -41,4 +42,5 @@
<string name="stk_dialog_accept" msgid="8498901537508923727">"是"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"否"</string>
<string name="no_sim_card_inserted" msgid="5316620398365235988">"請插入 SIM 卡以啟動 SIM 工具包。"</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"流動裝置服務訊息"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index eb0d1c9..d81037b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -34,6 +34,7 @@
<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_tone_dialog_msg" msgid="4595366992944391641">"正在播放音效"</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>
@@ -41,4 +42,5 @@
<string name="stk_dialog_accept" msgid="8498901537508923727">"是"</string>
<string name="stk_dialog_reject" msgid="921848059485746796">"否"</string>
<string name="no_sim_card_inserted" msgid="5316620398365235988">"請插入 SIM 卡以啟動 SIM 工具包。"</string>
+ <string name="stk_channel_name" msgid="8828587788561382056">"行動服務訊息"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 792299e..c462d14 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -34,6 +34,7 @@
<string name="enable_app" msgid="3701224550936728203">"Kuvunyelwe"</string>
<string name="disable_app" msgid="6725081975611415214">"Khutshaziwe"</string>
<string name="stk_dialog_title" msgid="6954825385456886726">"Ikhithi Yamathuluzi ye-SIM"</string>
+ <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Ukudlala ithoni"</string>
<string name="default_open_channel_msg" msgid="2216070254100295924">"Vula Isiteshi?"</string>
<string name="default_send_data_msg" msgid="6011219698689931272">"Thumela i-Data"</string>
<string name="default_receive_data_msg" msgid="618096941772010682">"Yamukela i-Data"</string>
@@ -41,4 +42,5 @@
<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>
+ <string name="stk_channel_name" msgid="8828587788561382056">"Imilayezo yesevisi yeselula"</string>
</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
new file mode 100755
index 0000000..d5f912e
--- /dev/null
+++ b/res/values/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <!-- Determines if alpha identifier of SET-UP MENU command is used for the menu title only -->
+ <bool name="show_menu_title_only_on_menu">true</bool>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ea50e85..3e62a6e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -50,6 +50,8 @@
<!-- Title text used for system dialog from STK app -->
<string name="stk_dialog_title">SIM ToolKit</string>
+ <!-- Default message when no alpha tag in Play Tone -->
+ <string name="default_tone_dialog_msg">Playing Tone</string>
<!-- Default message when no alpha in OPEN_CHANNEL -->
<string name="default_open_channel_msg">Open Channel?</string>
<!-- Default message when no alpha in SEND_DATA -->
@@ -62,4 +64,5 @@
<string name="stk_dialog_accept">YES</string>
<string name="stk_dialog_reject">NO</string>
<string name="no_sim_card_inserted">Please insert SIM to launch SIM Toolkit.</string>
+ <string name="stk_channel_name">Mobile service messages</string>
</resources>
diff --git a/res/xml/menu_conf.xml b/res/xml/menu_conf.xml
new file mode 100644
index 0000000..10701a8
--- /dev/null
+++ b/res/xml/menu_conf.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 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.
+-->
+
+<!--
+ Both of the attributes 'mcc' and 'mnc' are mandatory.
+ The other attributes are optional.
+ Example:
+
+ <operator mcc="001"
+ mnc="01"
+ label="Test SIM"
+ icon="ic_launcher_sim_toolkit_1"
+ />
+-->
+
+<operators>
+
+</operators>
diff --git a/src/com/android/stk/BootCompletedReceiver.java b/src/com/android/stk/BootCompletedReceiver.java
index ff46a50..d162910 100644
--- a/src/com/android/stk/BootCompletedReceiver.java
+++ b/src/com/android/stk/BootCompletedReceiver.java
@@ -35,6 +35,9 @@
@Override
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
+ if (action == null) {
+ return;
+ }
// make sure the app icon is removed every time the device boots.
if (action.equals(Intent.ACTION_BOOT_COMPLETED)) {
@@ -44,7 +47,8 @@
.putExtras(args));
CatLog.d(LOG_TAG, "[ACTION_BOOT_COMPLETED]");
} else if(action.equals(Intent.ACTION_USER_INITIALIZE)) {
- if (!android.os.Process.myUserHandle().isOwner()) {
+ // TODO: http://b/25155491
+ if (!android.os.Process.myUserHandle().isSystem()) {
//Disable package for all secondary users. Package is only required for device
//owner.
context.getPackageManager().setApplicationEnabledSetting(context.getPackageName(),
diff --git a/src/com/android/stk/StkApp.java b/src/com/android/stk/StkApp.java
index 4484493..9d653c1 100644
--- a/src/com/android/stk/StkApp.java
+++ b/src/com/android/stk/StkApp.java
@@ -40,7 +40,7 @@
static final int UI_TIMEOUT = (30 * 1000);
// Tone default timeout - 2 seconds
- static final int TONE_DFEAULT_TIMEOUT = (2 * 1000);
+ static final int TONE_DEFAULT_TIMEOUT = (2 * 1000);
public static final String TAG = "STK App";
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index c9a352b..4e8ae9a 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -20,18 +20,17 @@
import android.app.ActivityManager.RunningTaskInfo;
import android.app.AlertDialog;
import android.app.Notification;
+import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.Service;
import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.ActivityManager.RecentTaskInfo;
-import android.app.ActivityManager.RunningAppProcessInfo;
-import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.content.res.Resources.NotFoundException;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.Uri;
@@ -40,30 +39,28 @@
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
+import android.os.Parcel;
+import android.os.PersistableBundle;
import android.os.PowerManager;
import android.os.SystemProperties;
+import android.os.Vibrator;
import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
-import android.view.Window;
import android.view.WindowManager;
import android.widget.ImageView;
-import android.widget.RemoteViews;
import android.widget.TextView;
import android.widget.Toast;
-import android.content.BroadcastReceiver;
import android.content.IntentFilter;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
import com.android.internal.telephony.cat.AppInterface;
import com.android.internal.telephony.cat.LaunchBrowserMode;
import com.android.internal.telephony.cat.Menu;
import com.android.internal.telephony.cat.Item;
-import com.android.internal.telephony.cat.Input;
import com.android.internal.telephony.cat.ResultCode;
import com.android.internal.telephony.cat.CatCmdMessage;
import com.android.internal.telephony.cat.CatCmdMessage.BrowserSettings;
@@ -71,12 +68,9 @@
import com.android.internal.telephony.cat.CatLog;
import com.android.internal.telephony.cat.CatResponseMessage;
import com.android.internal.telephony.cat.TextMessage;
+import com.android.internal.telephony.cat.ToneSettings;
import com.android.internal.telephony.uicc.IccRefreshResponse;
-import com.android.internal.telephony.uicc.IccCardStatus.CardState;
import com.android.internal.telephony.PhoneConstants;
-import com.android.internal.telephony.TelephonyIntents;
-import com.android.internal.telephony.IccCardConstants;
-import com.android.internal.telephony.uicc.UiccController;
import com.android.internal.telephony.GsmAlphabet;
import com.android.internal.telephony.cat.CatService;
@@ -165,6 +159,8 @@
private int mSimCount = 0;
private PowerManager mPowerManager = null;
private StkCmdReceiver mStkCmdReceiver = null;
+ private TonePlayer mTonePlayer = null;
+ private Vibrator mVibrator = null;
// Used for setting FLAG_ACTIVITY_NO_USER_ACTION when
// creating an intent.
@@ -188,6 +184,8 @@
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/";
+ static final String FINISH_TONE_ACTIVITY_ACTION =
+ "android.intent.action.stk.finish_activity";
// These below constants are used for SETUP_EVENT_LIST
static final String SETUP_EVENT_TYPE = "event";
@@ -211,6 +209,15 @@
//Invalid SetupEvent
static final int INVALID_SETUP_EVENT = 0xFF;
+ // Message id to signal stop tone due to play tone timeout.
+ private static final int OP_STOP_TONE = 16;
+
+ // Message id to signal stop tone on user keyback.
+ static final int OP_STOP_TONE_USER = 17;
+
+ // Message id to remove stop tone message from queue.
+ private static final int STOP_TONE_WHAT = 100;
+
// Response ids
static final int RES_ID_MENU_SELECTION = 11;
static final int RES_ID_INPUT = 12;
@@ -222,6 +229,7 @@
static final int RES_ID_BACKWARD = 21;
static final int RES_ID_END_SESSION = 22;
static final int RES_ID_EXIT = 23;
+ static final int RES_ID_ERROR = 24;
static final int YES = 1;
static final int NO = 0;
@@ -236,6 +244,9 @@
private static final String STK_DIALOG_ACTIVITY_NAME = PACKAGE_NAME + ".StkDialogActivity";
// Notification id used to display Idle Mode text in NotificationManager.
private static final int STK_NOTIFICATION_ID = 333;
+ // Notification channel containing all mobile service messages notifications.
+ private static final String STK_NOTIFICATION_CHANNEL_ID = "mobileServiceMessages";
+
private static final String LOG_TAG = new Object(){}.getClass().getEnclosingClass().getName();
// Inner class used for queuing telephony messages (proactive commands,
@@ -313,6 +324,7 @@
//If all StkServices are not available, stop itself and uninstall apk.
for (i = PhoneConstants.SIM_ID_1; i < mSimCount; i++) {
if (i != slotId
+ && (mStkService[i] != null)
&& (mStkContext[i].mStkServiceState == STATE_UNKNOWN
|| mStkContext[i].mStkServiceState == STATE_EXIST)) {
break;
@@ -348,6 +360,10 @@
case OP_END_SESSION:
case OP_BOOT_COMPLETED:
break;
+ case OP_STOP_TONE_USER:
+ msg.obj = args;
+ msg.what = STOP_TONE_WHAT;
+ break;
default:
return;
}
@@ -362,6 +378,7 @@
mStkCmdReceiver = null;
}
mPowerManager = null;
+ sInstance = null;
waitForLooper();
mServiceLooper.quit();
}
@@ -440,7 +457,28 @@
Menu getMainMenu(int slotId) {
CatLog.d(LOG_TAG, "StkAppService, getMainMenu, sim id: " + slotId);
if (slotId >=0 && slotId < mSimCount && (mStkContext[slotId].mMainCmd != null)) {
- return mStkContext[slotId].mMainCmd.getMenu();
+ Menu menu = mStkContext[slotId].mMainCmd.getMenu();
+ if (menu != null && mSimCount > PhoneConstants.MAX_PHONE_COUNT_SINGLE_SIM) {
+ // If alpha identifier or icon identifier with the self-explanatory qualifier is
+ // specified in SET-UP MENU command, it should be more prioritized than preset ones.
+ if (menu.title == null
+ && (menu.titleIcon == null || !menu.titleIconSelfExplanatory)) {
+ StkMenuConfig config = StkMenuConfig.getInstance(getApplicationContext());
+ String label = config.getLabel(slotId);
+ Bitmap icon = config.getIcon(slotId);
+ if (label != null || icon != null) {
+ Parcel parcel = Parcel.obtain();
+ menu.writeToParcel(parcel, 0);
+ parcel.setDataPosition(0);
+ menu = Menu.CREATOR.createFromParcel(parcel);
+ parcel.recycle();
+ menu.title = label;
+ menu.titleIcon = icon;
+ menu.titleIconSelfExplanatory = false;
+ }
+ }
+ }
+ return menu;
} else {
return null;
}
@@ -562,10 +600,17 @@
handleCardStatusChangeAndIccRefresh((Bundle) msg.obj, slotId);
break;
case OP_SET_ACT_INST:
- Activity act = new Activity();
- act = (Activity) msg.obj;
- CatLog.d(LOG_TAG, "Set activity instance. " + act);
- mStkContext[slotId].mActivityInstance = act;
+ Activity act = (Activity) msg.obj;
+ if (mStkContext[slotId].mActivityInstance != act) {
+ CatLog.d(LOG_TAG, "Set activity instance - " + act);
+ Activity previous = mStkContext[slotId].mActivityInstance;
+ mStkContext[slotId].mActivityInstance = act;
+ // Finish the previous one if it has not been finished yet somehow.
+ if (previous != null && !previous.isDestroyed() && !previous.isFinishing()) {
+ CatLog.d(LOG_TAG, "Finish the previous pending activity - " + previous);
+ previous.finish();
+ }
+ }
break;
case OP_SET_DAL_INST:
Activity dal = new Activity();
@@ -581,7 +626,11 @@
break;
case OP_LOCALE_CHANGED:
CatLog.d(this, "Locale Changed");
- checkForSetupEvent(LANGUAGE_SELECTION_EVENT,(Bundle) msg.obj, slotId);
+ for (int slot = PhoneConstants.SIM_ID_1; slot < mSimCount; slot++) {
+ checkForSetupEvent(LANGUAGE_SELECTION_EVENT, (Bundle) msg.obj, slot);
+ }
+ // rename all registered notification channels on locale change
+ createAllChannels();
break;
case OP_ALPHA_NOTIFY:
handleAlphaNotify((Bundle) msg.obj);
@@ -593,6 +642,11 @@
}
}
break;
+ case OP_STOP_TONE_USER:
+ case OP_STOP_TONE:
+ CatLog.d(this, "Stop tone");
+ handleStopTone(msg, slotId);
+ break;
}
}
@@ -604,6 +658,8 @@
CatLog.d(LOG_TAG, "CARD is ABSENT");
// Uninstall STKAPP, Clear Idle text, Stop StkAppService
mNotificationManager.cancel(getNotificationId(slotId));
+ mStkContext[slotId].mCurrentMenu = null;
+ mStkContext[slotId].mMainCmd = null;
if (isAllOtherCardsAbsent(slotId)) {
CatLog.d(LOG_TAG, "All CARDs are ABSENT");
StkAppInstaller.unInstall(mContext);
@@ -689,9 +745,9 @@
private void sendResponse(int resId, int slotId, boolean confirm) {
Message msg = mServiceHandler.obtainMessage();
msg.arg1 = OP_RESPONSE;
+ msg.arg2 = slotId;
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);
@@ -794,18 +850,43 @@
}
// returns true if any Stk related activity already has focus on the screen
- private boolean isTopOfStack() {
- ActivityManager mAcivityManager = (ActivityManager) mContext
+ boolean isTopOfStack() {
+ ActivityManager mActivityManager = (ActivityManager) mContext
.getSystemService(ACTIVITY_SERVICE);
- String currentPackageName = mAcivityManager.getRunningTasks(1).get(0).topActivity
- .getPackageName();
+ String currentPackageName = null;
+ List<RunningTaskInfo> tasks = mActivityManager.getRunningTasks(1);
+ if (tasks == null || tasks.get(0).topActivity == null) {
+ return false;
+ }
+ currentPackageName = tasks.get(0).topActivity.getPackageName();
if (null != currentPackageName) {
return currentPackageName.equals(PACKAGE_NAME);
}
-
return false;
}
+ /**
+ * Get the boolean config from carrier config manager.
+ *
+ * @param context the context to get carrier service
+ * @param key config key defined in CarrierConfigManager
+ * @return boolean value of corresponding key.
+ */
+ private static boolean getBooleanCarrierConfig(Context context, String key) {
+ CarrierConfigManager configManager = (CarrierConfigManager) context.getSystemService(
+ Context.CARRIER_CONFIG_SERVICE);
+ PersistableBundle b = null;
+ if (configManager != null) {
+ b = configManager.getConfig();
+ }
+ if (b != null) {
+ return b.getBoolean(key);
+ } else {
+ // Return static default defined in CarrierConfigManager.
+ return CarrierConfigManager.getDefaultConfig().getBoolean(key);
+ }
+ }
+
private void handleCmd(CatCmdMessage cmdMsg, int slotId) {
if (cmdMsg == null) {
@@ -827,10 +908,9 @@
if (mStkContext[slotId].lastSelectedItem != null) {
msg.title = mStkContext[slotId].lastSelectedItem;
} else if (mStkContext[slotId].mMainCmd != null){
- msg.title = mStkContext[slotId].mMainCmd.getMenu().title;
- } else {
- // TODO: get the carrier name from the SIM
- msg.title = "";
+ if (!getResources().getBoolean(R.bool.show_menu_title_only_on_menu)) {
+ msg.title = mStkContext[slotId].mMainCmd.getMenu().title;
+ }
}
//If we receive a low priority Display Text and the device is
// not displaying any STK related activity and the screen is not idle
@@ -871,10 +951,10 @@
//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
- && (mStkContext[slotId].mSetupMenuState == STATE_UNKNOWN
- || mStkContext[slotId].mSetupMenuState == STATE_EXIST)) {
+ && (mStkContext[i].mSetupMenuState == STATE_UNKNOWN
+ || mStkContext[i].mSetupMenuState == STATE_EXIST)) {
CatLog.d(LOG_TAG, "Not Uninstall App:" + i + ","
- + mStkContext[slotId].mSetupMenuState);
+ + mStkContext[i].mSetupMenuState);
break;
}
}
@@ -916,21 +996,39 @@
launchEventMessage(slotId);
break;
case LAUNCH_BROWSER:
- TextMessage alphaId = mStkContext[slotId].mCurrentCmd.geTextMessage();
- if ((mStkContext[slotId].mCurrentCmd.getBrowserSettings().mode
- == LaunchBrowserMode.LAUNCH_IF_NOT_ALREADY_LAUNCHED) &&
- ((alphaId == null) || TextUtils.isEmpty(alphaId.text))) {
- // don't need user confirmation in this case
- // just launch the browser or spawn a new tab
- CatLog.d(this, "Browser mode is: launch if not already launched " +
- "and user confirmation is not currently needed.\n" +
- "supressing confirmation dialogue and confirming silently...");
- mStkContext[slotId].launchBrowser = true;
- mStkContext[slotId].mBrowserSettings =
- mStkContext[slotId].mCurrentCmd.getBrowserSettings();
- sendResponse(RES_ID_CONFIRM, slotId, true);
+ // The device setup process should not be interrupted by launching browser.
+ if (Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.DEVICE_PROVISIONED, 0) == 0) {
+ CatLog.d(this, "The command is not performed if the setup has not been completed.");
+ sendScreenBusyResponse(slotId);
+ break;
+ }
+
+ /* Check if Carrier would not want to launch browser */
+ if (getBooleanCarrierConfig(mContext,
+ CarrierConfigManager.KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL)) {
+ CatLog.d(this, "Browser is not launched as per carrier.");
+ sendResponse(RES_ID_DONE, slotId, true);
+ break;
+ }
+
+ mStkContext[slotId].mBrowserSettings =
+ mStkContext[slotId].mCurrentCmd.getBrowserSettings();
+ if (!isUrlAvailableToLaunchBrowser(mStkContext[slotId].mBrowserSettings)) {
+ CatLog.d(this, "Browser url property is not set - send error");
+ sendResponse(RES_ID_ERROR, slotId, true);
} else {
- launchConfirmationDialog(alphaId, slotId);
+ TextMessage alphaId = mStkContext[slotId].mCurrentCmd.geTextMessage();
+ if ((alphaId == null) || TextUtils.isEmpty(alphaId.text)) {
+ // don't need user confirmation in this case
+ // just launch the browser or spawn a new tab
+ CatLog.d(this, "user confirmation is not currently needed.\n" +
+ "supressing confirmation dialogue and confirming silently...");
+ mStkContext[slotId].launchBrowser = true;
+ sendResponse(RES_ID_CONFIRM, slotId, true);
+ } else {
+ launchConfirmationDialog(alphaId, slotId);
+ }
}
break;
case SET_UP_CALL:
@@ -942,7 +1040,7 @@
launchConfirmationDialog(mesg, slotId);
break;
case PLAY_TONE:
- launchToneDialog(slotId);
+ handlePlayTone(slotId);
break;
case OPEN_CHANNEL:
launchOpenChannelDialog(slotId);
@@ -1075,8 +1173,6 @@
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);
}
@@ -1126,7 +1222,14 @@
resMsg.setConfirmation(confirmed);
}
break;
-
+ case RES_ID_ERROR:
+ CatLog.d(LOG_TAG, "RES_ID_ERROR");
+ switch (mStkContext[slotId].mCurrentCmd.getCmdType()) {
+ case LAUNCH_BROWSER:
+ resMsg.setResultCode(ResultCode.LAUNCH_BROWSER_ERROR);
+ break;
+ }
+ break;
default:
CatLog.d(LOG_TAG, "Unknown result id");
return;
@@ -1520,7 +1623,7 @@
// this is good for scenarios where a related DISPLAY TEXT command is
// followed immediately.
try {
- Thread.sleep(10000);
+ Thread.sleep(3000);
} catch (InterruptedException e) {}
}
@@ -1539,9 +1642,9 @@
CatLog.d(LOG_TAG, "Add IdleMode text");
PendingIntent pendingIntent = PendingIntent.getService(mContext, 0,
new Intent(mContext, StkAppService.class), 0);
-
+ createAllChannels();
final Notification.Builder notificationBuilder = new Notification.Builder(
- StkAppService.this);
+ StkAppService.this, STK_NOTIFICATION_CHANNEL_ID);
if (mStkContext[slotId].mMainCmd != null &&
mStkContext[slotId].mMainCmd.getMenu() != null) {
notificationBuilder.setContentTitle(mStkContext[slotId].mMainCmd.getMenu().title);
@@ -1572,6 +1675,17 @@
}
}
+ /** Creates the notification channel and registers it with NotificationManager.
+ * If a channel with the same ID is already registered, NotificationManager will
+ * ignore this call.
+ */
+ private void createAllChannels() {
+ mNotificationManager.createNotificationChannel(new NotificationChannel(
+ STK_NOTIFICATION_CHANNEL_ID,
+ getResources().getString(R.string.stk_channel_name),
+ NotificationManager.IMPORTANCE_MIN));
+ }
+
private void launchToneDialog(int slotId) {
Intent newIntent = new Intent(this, ToneDialog.class);
String uriString = STK_TONE_URI + slotId;
@@ -1589,7 +1703,125 @@
startActivity(newIntent);
}
- private void launchOpenChannelDialog(int slotId) {
+ private void handlePlayTone(int slotId) {
+ TextMessage toneMsg = mStkContext[slotId].mCurrentCmd.geTextMessage();
+
+ boolean showUser = true;
+ boolean displayDialog = true;
+ Resources resource = Resources.getSystem();
+ try {
+ displayDialog = !resource.getBoolean(
+ com.android.internal.R.bool.config_stkNoAlphaUsrCnf);
+ } catch (NotFoundException e) {
+ displayDialog = true;
+ }
+
+ // As per the spec 3GPP TS 11.14, 6.4.5. Play Tone.
+ // If there is no alpha identifier tlv present, UE may show the
+ // user information. 'config_stkNoAlphaUsrCnf' value will decide
+ // whether to show it or not.
+ // If alpha identifier tlv is present and its data is null, play only tone
+ // without showing user any information.
+ // Alpha Id is Present, but the text data is null.
+ if ((toneMsg.text != null ) && (toneMsg.text.equals(""))) {
+ CatLog.d(this, "Alpha identifier data is null, play only tone");
+ showUser = false;
+ }
+ // Alpha Id is not present AND we need to show info to the user.
+ if (toneMsg.text == null && displayDialog) {
+ CatLog.d(this, "toneMsg.text " + toneMsg.text
+ + " Starting ToneDialog activity with default message.");
+ toneMsg.text = getResources().getString(R.string.default_tone_dialog_msg);
+ showUser = true;
+ }
+ // Dont show user info, if config setting is true.
+ if (toneMsg.text == null && !displayDialog) {
+ CatLog.d(this, "config value stkNoAlphaUsrCnf is true");
+ showUser = false;
+ }
+
+ CatLog.d(this, "toneMsg.text: " + toneMsg.text + "showUser: " +showUser +
+ "displayDialog: " +displayDialog);
+ playTone(showUser, slotId);
+ }
+
+ private void playTone(boolean showUserInfo, int slotId) {
+ // Start playing tone and vibration
+ ToneSettings settings = mStkContext[slotId].mCurrentCmd.getToneSettings();
+ if (null == settings) {
+ CatLog.d(this, "null settings, not playing tone.");
+ return;
+ }
+
+ mVibrator = (Vibrator)getSystemService(VIBRATOR_SERVICE);
+ mTonePlayer = new TonePlayer();
+ mTonePlayer.play(settings.tone);
+ int timeout = StkApp.calculateDurationInMilis(settings.duration);
+ if (timeout == 0) {
+ timeout = StkApp.TONE_DEFAULT_TIMEOUT;
+ }
+
+ Message msg = mServiceHandler.obtainMessage();
+ msg.arg1 = OP_STOP_TONE;
+ msg.arg2 = slotId;
+ msg.obj = (Integer)(showUserInfo ? 1 : 0);
+ msg.what = STOP_TONE_WHAT;
+ mServiceHandler.sendMessageDelayed(msg, timeout);
+ if (settings.vibrate) {
+ mVibrator.vibrate(timeout);
+ }
+
+ // Start Tone dialog Activity to show user the information.
+ if (showUserInfo) {
+ Intent newIntent = new Intent(sInstance, ToneDialog.class);
+ String uriString = STK_TONE_URI + slotId;
+ Uri uriData = Uri.parse(uriString);
+ newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+ | Intent.FLAG_ACTIVITY_NO_HISTORY
+ | Intent.FLAG_ACTIVITY_SINGLE_TOP
+ | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
+ | getFlagActivityNoUserAction(InitiatedByUserAction.unknown, slotId));
+ newIntent.putExtra("TEXT", mStkContext[slotId].mCurrentCmd.geTextMessage());
+ newIntent.putExtra(SLOT_ID, slotId);
+ newIntent.setData(uriData);
+ startActivity(newIntent);
+ }
+ }
+
+ private void finishToneDialogActivity() {
+ Intent finishIntent = new Intent(FINISH_TONE_ACTIVITY_ACTION);
+ sendBroadcast(finishIntent);
+ }
+
+ private void handleStopTone(Message msg, int slotId) {
+ int resId = 0;
+
+ // Stop the play tone in following cases:
+ // 1.OP_STOP_TONE: play tone timer expires.
+ // 2.STOP_TONE_USER: user pressed the back key.
+ if (msg.arg1 == OP_STOP_TONE) {
+ resId = RES_ID_DONE;
+ // Dismiss Tone dialog, after finishing off playing the tone.
+ int finishActivity = (Integer) msg.obj;
+ if (finishActivity == 1) finishToneDialogActivity();
+ } else if (msg.arg1 == OP_STOP_TONE_USER) {
+ resId = RES_ID_END_SESSION;
+ }
+
+ sendResponse(resId, slotId, true);
+ mServiceHandler.removeMessages(STOP_TONE_WHAT);
+ if (mTonePlayer != null) {
+ mTonePlayer.stop();
+ mTonePlayer.release();
+ mTonePlayer = null;
+ }
+ if (mVibrator != null) {
+ mVibrator.cancel();
+ mVibrator = null;
+ }
+ }
+
+ private void launchOpenChannelDialog(final int slotId) {
TextMessage msg = mStkContext[slotId].mCurrentCmd.geTextMessage();
if (msg == null) {
CatLog.d(LOG_TAG, "msg is null, return here");
@@ -1614,6 +1846,7 @@
args.putInt(CHOICE, YES);
Message message = mServiceHandler.obtainMessage();
message.arg1 = OP_RESPONSE;
+ message.arg2 = slotId;
message.obj = args;
mServiceHandler.sendMessage(message);
}
@@ -1626,6 +1859,7 @@
args.putInt(CHOICE, NO);
Message message = mServiceHandler.obtainMessage();
message.arg1 = OP_RESPONSE;
+ message.arg2 = slotId;
message.obj = args;
mServiceHandler.sendMessage(message);
}
@@ -1728,4 +1962,12 @@
toast.setGravity(Gravity.TOP, 0, 0);
toast.show();
}
+
+ private boolean isUrlAvailableToLaunchBrowser(BrowserSettings settings) {
+ String url = SystemProperties.get(STK_BROWSER_DEFAULT_URL_SYSPROP, "");
+ if (url == "" && settings.url == null) {
+ return false;
+ }
+ return true;
+ }
}
diff --git a/src/com/android/stk/StkCmdReceiver.java b/src/com/android/stk/StkCmdReceiver.java
index 508e7f8..fd6f382 100644
--- a/src/com/android/stk/StkCmdReceiver.java
+++ b/src/com/android/stk/StkCmdReceiver.java
@@ -35,6 +35,9 @@
@Override
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
+ if (action == null) {
+ return;
+ }
if (action.equals(AppInterface.CAT_CMD_ACTION)) {
handleAction(context, intent, StkAppService.OP_CMD);
diff --git a/src/com/android/stk/StkDialogActivity.java b/src/com/android/stk/StkDialogActivity.java
index 24e1068..daa2ff3 100644
--- a/src/com/android/stk/StkDialogActivity.java
+++ b/src/com/android/stk/StkDialogActivity.java
@@ -18,29 +18,31 @@
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.AlertDialog;
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.content.DialogInterface;
+import android.view.KeyEvent;
+
import android.os.Bundle;
import android.os.SystemClock;
-import android.view.KeyEvent;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
import android.view.View;
-import android.view.Window;
-import android.widget.Button;
+import android.widget.ImageView;
import android.widget.TextView;
/**
* AlertDialog used for DISPLAY TEXT commands.
*
*/
-public class StkDialogActivity extends Activity implements View.OnClickListener {
+public class StkDialogActivity extends Activity {
// members
private static final String className = new Object(){}.getClass().getEnclosingClass().getName();
private static final String LOG_TAG = className.substring(className.lastIndexOf('.') + 1);
@@ -55,33 +57,90 @@
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";
+ // Keys for saving the state of the dialog in the bundle
+ private static final String TEXT_KEY = "text";
+ private static final String TIMEOUT_INTENT_KEY = "timeout";
+ private static final String SLOT_ID_KEY = "slotid";
- // message id for time out
- private static final int MSG_ID_TIMEOUT = 1;
-
- // buttons id
- public static final int OK_BUTTON = R.id.button_ok;
- public static final int CANCEL_BUTTON = R.id.button_cancel;
+ private AlertDialog mAlertDialog;
@Override
- protected void onCreate(Bundle icicle) {
- super.onCreate(icicle);
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
CatLog.d(LOG_TAG, "onCreate, sim id: " + mSlotId);
+
+ // appService can be null if this activity is automatically recreated by the system
+ // with the saved instance state right after the phone process is killed.
+ if (appService == null) {
+ CatLog.d(LOG_TAG, "onCreate - appService is null");
+ finish();
+ return;
+ }
+
// New Dialog is created - set to no response sent
mIsResponseSent = false;
- requestWindowFeature(Window.FEATURE_LEFT_ICON);
+ AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
- setContentView(R.layout.stk_msg_dialog);
+ alertDialogBuilder.setPositiveButton(R.string.button_ok, new
+ DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int id) {
+ CatLog.d(LOG_TAG, "OK Clicked!, mSlotId: " + mSlotId);
+ cancelTimeOut();
+ sendResponse(StkAppService.RES_ID_CONFIRM, true);
+ finish();
+ }
+ });
- Button okButton = (Button) findViewById(R.id.button_ok);
- Button cancelButton = (Button) findViewById(R.id.button_cancel);
+ alertDialogBuilder.setNegativeButton(R.string.button_cancel, new
+ DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog,int id) {
+ CatLog.d(LOG_TAG, "Cancel Clicked!, mSlotId: " + mSlotId);
+ cancelTimeOut();
+ sendResponse(StkAppService.RES_ID_CONFIRM, false);
+ finish();
+ }
+ });
+ alertDialogBuilder.create();
- okButton.setOnClickListener(this);
- cancelButton.setOnClickListener(this);
+ initFromIntent(getIntent());
+ if (mTextMsg == null) {
+ finish();
+ return;
+ }
+
+ if (!mTextMsg.responseNeeded) {
+ alertDialogBuilder.setNegativeButton(null, null);
+ }
+
+ alertDialogBuilder.setTitle(mTextMsg.title);
+
+ LayoutInflater inflater = this.getLayoutInflater();
+ View dialogView = inflater.inflate(R.layout.stk_msg_dialog, null);
+ alertDialogBuilder.setView(dialogView);
+ TextView tv = (TextView) dialogView.findViewById(R.id.message);
+ ImageView iv = (ImageView) dialogView.findViewById(R.id.icon);
+
+ if (mTextMsg.icon != null) {
+ iv.setImageBitmap(mTextMsg.icon);
+ } else {
+ iv.setVisibility(View.GONE);
+ }
+
+ // Per spec, only set text if the icon is not provided or not self-explanatory
+ if ((mTextMsg.icon == null || !mTextMsg.iconSelfExplanatory)
+ && !TextUtils.isEmpty(mTextMsg.text)) {
+ tv.setText(mTextMsg.text);
+ } else {
+ tv.setVisibility(View.GONE);
+ }
+
+ mAlertDialog = alertDialogBuilder.create();
+ mAlertDialog.setCanceledOnTouchOutside(false);
+ mAlertDialog.show();
mContext = getBaseContext();
IntentFilter intentFilter = new IntentFilter();
@@ -89,34 +148,18 @@
mContext.registerReceiver(mBroadcastReceiver, intentFilter);
mAlarmManager =(AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE);
- }
-
- public void onClick(View v) {
- String input = null;
- switch (v.getId()) {
- case OK_BUTTON:
- CatLog.d(LOG_TAG, "OK Clicked!, mSlotId: " + mSlotId);
- cancelTimeOut();
- sendResponse(StkAppService.RES_ID_CONFIRM, true);
- break;
- case CANCEL_BUTTON:
- CatLog.d(LOG_TAG, "Cancel Clicked!, mSlotId: " + mSlotId);
- cancelTimeOut();
- sendResponse(StkAppService.RES_ID_CONFIRM, false);
- break;
- }
- finish();
+ setFinishOnTouchOutside(false);
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
switch (keyCode) {
- case KeyEvent.KEYCODE_BACK:
- CatLog.d(LOG_TAG, "onKeyDown - KEYCODE_BACK");
- cancelTimeOut();
- sendResponse(StkAppService.RES_ID_BACKWARD);
- finish();
- break;
+ case KeyEvent.KEYCODE_BACK:
+ CatLog.d(LOG_TAG, "onKeyDown - KEYCODE_BACK");
+ cancelTimeOut();
+ sendResponse(StkAppService.RES_ID_BACKWARD);
+ finish();
+ break;
}
return false;
}
@@ -127,31 +170,6 @@
CatLog.d(LOG_TAG, "onResume - mIsResponseSent[" + mIsResponseSent +
"], sim id: " + mSlotId);
- initFromIntent(getIntent());
- if (mTextMsg == null) {
- finish();
- return;
- }
-
- 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
@@ -159,7 +177,7 @@
* ETSI 102.223, 6.4.1)
*/
if (StkApp.calculateDurationInMilis(mTextMsg.duration) == 0 &&
- !mTextMsg.responseNeeded && mTextMsg.userClear) {
+ !mTextMsg.responseNeeded && mTextMsg.userClear) {
CatLog.d(LOG_TAG, "User should clear text..showing message forever");
return;
}
@@ -170,7 +188,7 @@
* 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
+ * inform the SIM in correct time when there is no response from the User
* to a dialog.
*/
if (mTimeoutIntent != null) {
@@ -210,6 +228,16 @@
super.onStop();
CatLog.d(LOG_TAG, "onStop - before Send CONFIRM false mIsResponseSent[" +
mIsResponseSent + "], sim id: " + mSlotId);
+
+ // Avoid calling finish() or setPendingDialogInstance()
+ // if the activity is being restarted now.
+ if (isChangingConfigurations()) {
+ return;
+ }
+
+ if (!mTextMsg.responseNeeded) {
+ return;
+ }
if (!mIsResponseSent) {
appService.getStkContext(mSlotId).setPendingDialogInstance(this);
} else {
@@ -225,13 +253,24 @@
super.onDestroy();
CatLog.d(LOG_TAG, "onDestroy - mIsResponseSent[" + mIsResponseSent +
"], sim id: " + mSlotId);
+
+ if (mAlertDialog != null && mAlertDialog.isShowing()) {
+ mAlertDialog.dismiss();
+ mAlertDialog = null;
+ }
+
+ if (appService == null) {
+ return;
+ }
// if dialog activity is finished by stkappservice
// when receiving OP_LAUNCH_APP from the other SIM, we can not send TR here
// , since the dialog cmd is waiting user to process.
- if (!mIsResponseSent && !appService.isDialogPending(mSlotId)) {
- sendResponse(StkAppService.RES_ID_CONFIRM, false);
+ if (!isChangingConfigurations()) {
+ if (!mIsResponseSent && appService != null && !appService.isDialogPending(mSlotId)) {
+ sendResponse(StkAppService.RES_ID_CONFIRM, false);
+ }
+ cancelTimeOut();
}
- cancelTimeOut();
// Cleanup broadcast receivers to avoid leaks
if (mBroadcastReceiver != null) {
unregisterReceiver(mBroadcastReceiver);
@@ -244,14 +283,19 @@
super.onSaveInstanceState(outState);
- outState.putParcelable(TEXT, mTextMsg);
+ outState.putParcelable(TEXT_KEY, mTextMsg);
+ outState.putParcelable(TIMEOUT_INTENT_KEY, mTimeoutIntent);
+ outState.putInt(SLOT_ID_KEY, mSlotId);
}
@Override
public void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
- mTextMsg = savedInstanceState.getParcelable(TEXT);
+ mTextMsg = savedInstanceState.getParcelable(TEXT_KEY);
+ mTimeoutIntent = savedInstanceState.getParcelable(TIMEOUT_INTENT_KEY);
+ mSlotId = savedInstanceState.getInt(SLOT_ID_KEY);
+ appService.getStkContext(mSlotId).setPendingDialogInstance(this);
CatLog.d(LOG_TAG, "onRestoreInstanceState - [" + mTextMsg + "]");
}
@@ -335,11 +379,11 @@
// 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);
+ SystemClock.elapsedRealtime() + dialogDuration, mTimeoutIntent);
}
else {
mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,
- SystemClock.elapsedRealtime() + dialogDuration, mTimeoutIntent);
+ SystemClock.elapsedRealtime() + dialogDuration, mTimeoutIntent);
}
}
}
diff --git a/src/com/android/stk/StkInputActivity.java b/src/com/android/stk/StkInputActivity.java
index 53bea93..a4e6daf 100644
--- a/src/com/android/stk/StkInputActivity.java
+++ b/src/com/android/stk/StkInputActivity.java
@@ -16,9 +16,11 @@
package com.android.stk;
+import android.app.ActionBar;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
+import android.content.res.Configuration;
import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle;
import android.os.Handler;
@@ -26,13 +28,18 @@
import android.text.Editable;
import android.text.InputFilter;
import android.text.InputType;
+import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.method.PasswordTransformationMethod;
+import android.view.inputmethod.EditorInfo;
import android.view.KeyEvent;
+import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.Window;
import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.PopupMenu;
import android.widget.TextView;
import android.widget.EditText;
import android.widget.TextView.BufferType;
@@ -51,6 +58,8 @@
private Context mContext;
private EditText mTextIn = null;
private TextView mPromptView = null;
+ private View mMoreOptions = null;
+ private PopupMenu mPopupMenu = null;
private View mYesNoLayout = null;
private View mNormalLayout = null;
@@ -121,6 +130,28 @@
mAcceptUsersInput = false;
input = NO_STR_RESPONSE;
break;
+ case R.id.more:
+ if (mPopupMenu == null) {
+ mPopupMenu = new PopupMenu(this, v);
+ Menu menu = mPopupMenu.getMenu();
+ createOptionsMenuInternal(menu);
+ prepareOptionsMenuInternal(menu);
+ mPopupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+ public boolean onMenuItemClick(MenuItem item) {
+ optionsItemSelectedInternal(item);
+ return true;
+ }
+ });
+ mPopupMenu.setOnDismissListener(new PopupMenu.OnDismissListener() {
+ public void onDismiss(PopupMenu menu) {
+ mPopupMenu = null;
+ }
+ });
+ mPopupMenu.show();
+ }
+ return;
+ default:
+ break;
}
CatLog.d(LOG_TAG, "handleClick, ready to response");
cancelTimeOut();
@@ -134,10 +165,31 @@
CatLog.d(LOG_TAG, "onCreate - mIsResponseSent[" + mIsResponseSent + "]");
+ // appService can be null if this activity is automatically recreated by the system
+ // with the saved instance state right after the phone process is killed.
+ if (appService == null) {
+ CatLog.d(LOG_TAG, "onCreate - appService is null");
+ finish();
+ return;
+ }
+
+ ActionBar actionBar = null;
+ if (getResources().getBoolean(R.bool.show_menu_title_only_on_menu)) {
+ actionBar = getActionBar();
+ if (actionBar != null) {
+ actionBar.hide();
+ }
+ }
+
// Set the layout for this activity.
- requestWindowFeature(Window.FEATURE_LEFT_ICON);
setContentView(R.layout.stk_input);
+ if (actionBar != null) {
+ mMoreOptions = findViewById(R.id.more);
+ mMoreOptions.setVisibility(View.VISIBLE);
+ mMoreOptions.setOnClickListener(this);
+ }
+
// Initialize members
mTextIn = (EditText) this.findViewById(R.id.in_text);
mPromptView = (TextView) this.findViewById(R.id.prompt);
@@ -171,24 +223,24 @@
CatLog.d(LOG_TAG, "onResume - mIsResponseSent[" + mIsResponseSent +
"], slot id: " + mSlotId);
startTimeOut();
- appService.getStkContext(mSlotId).setPendingActivityInstance(null);
- if (mIsResponseSent) {
- cancelTimeOut();
- finish();
- }
}
@Override
public void onPause() {
super.onPause();
CatLog.d(LOG_TAG, "onPause - mIsResponseSent[" + mIsResponseSent + "]");
+ if (mPopupMenu != null) {
+ mPopupMenu.dismiss();
+ }
}
@Override
public void onStop() {
super.onStop();
CatLog.d(LOG_TAG, "onStop - mIsResponseSent[" + mIsResponseSent + "]");
- if (mIsResponseSent) {
+ // It is unnecessary to keep this activity if the response was already sent and
+ // this got invisible because of the other full-screen activity in this application.
+ if (mIsResponseSent && appService.isTopOfStack()) {
cancelTimeOut();
finish();
} else {
@@ -201,6 +253,9 @@
super.onDestroy();
CatLog.d(LOG_TAG, "onDestroy - before Send End Session mIsResponseSent[" +
mIsResponseSent + " , " + mSlotId + "]");
+ if (appService == null) {
+ return;
+ }
//If the input activity is finished by stkappservice
//when receiving OP_LAUNCH_APP from the other SIM, we can not send TR here
//, since the input cmd is waiting user to process.
@@ -212,6 +267,14 @@
}
@Override
+ public void onConfigurationChanged(Configuration newConfig) {
+ super.onConfigurationChanged(newConfig);
+ if (mPopupMenu != null) {
+ mPopupMenu.dismiss();
+ }
+ }
+
+ @Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (!mAcceptUsersInput) {
CatLog.d(LOG_TAG, "mAcceptUsersInput:false");
@@ -245,6 +308,10 @@
return;
}
+ if (mMoreOptions != null) {
+ mMoreOptions.setVisibility(View.INVISIBLE);
+ }
+
CatLog.d(LOG_TAG, "sendResponse resID[" + resId + "] input[*****] help["
+ help + "]");
mIsResponseSent = true;
@@ -263,24 +330,36 @@
@Override
public boolean onCreateOptionsMenu(android.view.Menu menu) {
super.onCreateOptionsMenu(menu);
- menu.add(android.view.Menu.NONE, StkApp.MENU_ID_END_SESSION, 1,
- R.string.menu_end_session);
- menu.add(0, StkApp.MENU_ID_HELP, 2, R.string.help);
-
+ createOptionsMenuInternal(menu);
return true;
}
+ private void createOptionsMenuInternal(Menu menu) {
+ menu.add(Menu.NONE, StkApp.MENU_ID_END_SESSION, 1, R.string.menu_end_session);
+ menu.add(0, StkApp.MENU_ID_HELP, 2, R.string.help);
+ }
+
@Override
public boolean onPrepareOptionsMenu(android.view.Menu menu) {
super.onPrepareOptionsMenu(menu);
+ prepareOptionsMenuInternal(menu);
+ return true;
+ }
+
+ private void prepareOptionsMenuInternal(Menu menu) {
menu.findItem(StkApp.MENU_ID_END_SESSION).setVisible(true);
menu.findItem(StkApp.MENU_ID_HELP).setVisible(mStkInput.helpAvailable);
-
- return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
+ if (optionsItemSelectedInternal(item)) {
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
+ }
+
+ private boolean optionsItemSelectedInternal(MenuItem item) {
if (!mAcceptUsersInput) {
CatLog.d(LOG_TAG, "mAcceptUsersInput:false");
return true;
@@ -299,7 +378,7 @@
finish();
return true;
}
- return super.onOptionsItemSelected(item);
+ return false;
}
@Override
@@ -312,6 +391,9 @@
protected void onRestoreInstanceState(Bundle savedInstanceState) {
CatLog.d(LOG_TAG, "onRestoreInstanceState: " + mSlotId);
mAcceptUsersInput = savedInstanceState.getBoolean("ACCEPT_USERS_INPUT");
+ if ((mAcceptUsersInput == false) && (mMoreOptions != null)) {
+ mMoreOptions.setVisibility(View.INVISIBLE);
+ }
}
public void beforeTextChanged(CharSequence s, int start, int count,
@@ -357,7 +439,11 @@
int inTypeId = R.string.alphabet;
// set the prompt.
- mPromptView.setText(mStkInput.text);
+ if ((mStkInput.icon == null || !mStkInput.iconSelfExplanatory)
+ && !TextUtils.isEmpty(mStkInput.text)) {
+ mPromptView.setText(mStkInput.text);
+ mPromptView.setVisibility(View.VISIBLE);
+ }
// Set input type (alphabet/digit) info close to the InText form.
if (mStkInput.digitOnly) {
@@ -366,9 +452,12 @@
}
inTypeView.setText(inTypeId);
+ setTitle(R.string.app_name);
+
if (mStkInput.icon != null) {
- setFeatureDrawable(Window.FEATURE_LEFT_ICON, new BitmapDrawable(
- mStkInput.icon));
+ ImageView imageView = (ImageView) findViewById(R.id.icon);
+ imageView.setImageBitmap(mStkInput.icon);
+ imageView.setVisibility(View.VISIBLE);
}
// Handle specific global and text attributes.
@@ -387,9 +476,10 @@
numOfCharsView.setText(lengthLimit);
if (!mStkInput.echo) {
- mTextIn.setInputType(InputType.TYPE_CLASS_NUMBER
- | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
+ mTextIn.setTransformationMethod(PasswordTransformationMethod
+ .getInstance());
}
+ mTextIn.setImeOptions(EditorInfo.IME_FLAG_NO_FULLSCREEN);
// Set default text if present.
if (mStkInput.defaultText != null) {
mTextIn.setText(mStkInput.defaultText);
diff --git a/src/com/android/stk/StkLauncherActivity.java b/src/com/android/stk/StkLauncherActivity.java
index 73529e9..9d2f60f 100644
--- a/src/com/android/stk/StkLauncherActivity.java
+++ b/src/com/android/stk/StkLauncherActivity.java
@@ -16,13 +16,13 @@
package com.android.stk;
+import android.app.ActionBar;
import android.app.ListActivity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.view.KeyEvent;
-import android.view.Window;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
@@ -62,7 +62,11 @@
mContext = getBaseContext();
mTm = (TelephonyManager) mContext.getSystemService(
Context.TELEPHONY_SERVICE);
- requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+ ActionBar actionBar = getActionBar();
+ actionBar.setCustomView(R.layout.stk_title);
+ actionBar.setDisplayShowCustomEnabled(true);
+
setContentView(R.layout.stk_menu_list);
mTitleTextView = (TextView) findViewById(R.id.title_text);
mTitleIconView = (ImageView) findViewById(R.id.title_icon);
@@ -160,6 +164,11 @@
}
private int addStkMenuListItems() {
+ StkAppService appService = StkAppService.getInstance();
+ if (appService == null) {
+ return 0;
+ }
+
String appName = mContext.getResources().getString(R.string.app_name);
String stkItemName = null;
int simCount = TelephonyManager.from(mContext).getSimCount();
@@ -167,17 +176,31 @@
CatLog.d(LOG_TAG, "simCount: " + simCount);
for (int i = 0; i < simCount; i++) {
- //Check if the card is inserted.
+ // Check if the card is inserted.
if (mTm.hasIccCard(i)) {
- CatLog.d(LOG_TAG, "SIM " + i + " add to menu.");
- mSingleSimId = i;
- stkItemName = new StringBuilder(appName).append(" ")
- .append(Integer.toString(i + 1)).toString();
- Item item = new Item(i + 1, stkItemName, mBitMap);
- item.id = i;
- mStkMenuList.add(item);
+ Menu menu = appService.getMainMenu(i);
+ // Check if the card has a main menu.
+ if (menu != null) {
+ CatLog.d(LOG_TAG, "SIM #" + (i + 1) + " is add to menu.");
+ mSingleSimId = i;
+ stkItemName = new StringBuilder(menu.title == null ? appName : menu.title)
+ .append(" ").append(Integer.toString(i + 1)).toString();
+ // Display the default application icon if there is no icon specified by SET-UP
+ // MENU command nor preset.
+ Bitmap icon = mBitMap;
+ if (menu.titleIcon != null) {
+ icon = menu.titleIcon;
+ if (menu.titleIconSelfExplanatory) {
+ stkItemName = null;
+ }
+ }
+ Item item = new Item(i, stkItemName, icon);
+ mStkMenuList.add(item);
+ } else {
+ CatLog.d(LOG_TAG, "SIM #" + (i + 1) + " does not have main menu.");
+ }
} else {
- CatLog.d(LOG_TAG, "SIM " + i + " is not inserted.");
+ CatLog.d(LOG_TAG, "SIM #" + (i + 1) + " is not inserted.");
}
}
if (mStkMenuList != null && mStkMenuList.size() > 0) {
diff --git a/src/com/android/stk/StkMenuActivity.java b/src/com/android/stk/StkMenuActivity.java
old mode 100644
new mode 100755
index 2005971..04e5ed0
--- a/src/com/android/stk/StkMenuActivity.java
+++ b/src/com/android/stk/StkMenuActivity.java
@@ -17,12 +17,14 @@
package com.android.stk;
import android.app.ListActivity;
+import android.app.ActionBar;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
+import android.telephony.SubscriptionManager;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.KeyEvent;
@@ -99,8 +101,11 @@
super.onCreate(icicle);
CatLog.d(LOG_TAG, "onCreate");
- // Remove the default title, customized one is used.
- requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+ ActionBar actionBar = getActionBar();
+ actionBar.setCustomView(R.layout.stk_title);
+ actionBar.setDisplayShowCustomEnabled(true);
+
// Set the layout for this activity.
setContentView(R.layout.stk_menu_list);
mInstance = this;
@@ -110,7 +115,20 @@
mContext = getBaseContext();
mAcceptUsersInput = true;
getListView().setOnCreateContextMenuListener(this);
+
+ // appService can be null if this activity is automatically recreated by the system
+ // with the saved instance state right after the phone process is killed.
+ if (appService == null) {
+ CatLog.d(LOG_TAG, "onCreate - appService is null");
+ finish();
+ return;
+ }
+
initFromIntent(getIntent());
+ if (!SubscriptionManager.isValidSlotIndex(mSlotId)) {
+ finish();
+ return;
+ }
}
@Override
@@ -138,6 +156,8 @@
mAcceptUsersInput = false;
mProgressView.setVisibility(View.VISIBLE);
mProgressView.setIndeterminate(true);
+
+ invalidateOptionsMenu();
}
@Override
@@ -260,7 +280,9 @@
}
} else {
if (appService != null) {
- appService.getStkContext(mSlotId).setPendingActivityInstance(this);
+ if (mState == STATE_SECONDARY) {
+ appService.getStkContext(mSlotId).setPendingActivityInstance(this);
+ }
} else {
CatLog.d(LOG_TAG, "onStop: null appService.");
}
@@ -271,10 +293,13 @@
public void onDestroy() {
getListView().setOnCreateContextMenuListener(null);
super.onDestroy();
- CatLog.d(LOG_TAG, "onDestroy" + "," + mState);
+ CatLog.d(LOG_TAG, "onDestroy" + ", " + mState);
+ if (appService == null || !SubscriptionManager.isValidSlotIndex(mSlotId)) {
+ return;
+ }
//isMenuPending: if input act is finish by stkappservice when OP_LAUNCH_APP again,
//we can not send TR here, since the input cmd is waiting user to process.
- if (!mIsResponseSent && !appService.isMenuPending(mSlotId)) {
+ if (mState == STATE_SECONDARY && !mIsResponseSent && !appService.isMenuPending(mSlotId)) {
CatLog.d(LOG_TAG, "handleDestroy - Send End Session");
sendResponse(StkAppService.RES_ID_END_SESSION);
}
@@ -291,27 +316,21 @@
public boolean onCreateOptionsMenu(android.view.Menu menu) {
super.onCreateOptionsMenu(menu);
menu.add(0, StkApp.MENU_ID_END_SESSION, 1, R.string.menu_end_session);
- menu.add(0, StkApp.MENU_ID_HELP, 2, R.string.help);
return true;
}
@Override
public boolean onPrepareOptionsMenu(android.view.Menu menu) {
super.onPrepareOptionsMenu(menu);
- boolean helpVisible = false;
boolean mainVisible = false;
- if (mState == STATE_SECONDARY) {
+ if (mState == STATE_SECONDARY && mAcceptUsersInput) {
mainVisible = true;
}
- if (mStkMenu != null) {
- helpVisible = mStkMenu.helpAvailable;
- }
menu.findItem(StkApp.MENU_ID_END_SESSION).setVisible(mainVisible);
- menu.findItem(StkApp.MENU_ID_HELP).setVisible(helpVisible);
- return true;
+ return mainVisible;
}
@Override
@@ -328,17 +347,8 @@
cancelTimeOut();
finish();
return true;
- case StkApp.MENU_ID_HELP:
- cancelTimeOut();
- mAcceptUsersInput = false;
- int position = getSelectedItemPosition();
- Item stkItem = getSelectedItem(position);
- if (stkItem == null) {
- break;
- }
- // send help needed response.
- sendResponse(StkAppService.RES_ID_MENU_SELECTION, stkItem.id, true);
- return true;
+ default:
+ break;
}
return super.onOptionsItemSelected(item);
}
diff --git a/src/com/android/stk/StkMenuConfig.java b/src/com/android/stk/StkMenuConfig.java
new file mode 100644
index 0000000..88ce272
--- /dev/null
+++ b/src/com/android/stk/StkMenuConfig.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright (C) 2016 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.content.Context;
+import android.content.res.XmlResourceParser;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.Build;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
+import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.cat.CatLog;
+import com.android.internal.util.XmlUtils;
+
+import java.util.ArrayList;
+
+/**
+ * Provides preset label and/or icon in accordance with mcc/mnc
+ * conbination of the inserted SIM card for Multi-SIM model.
+ */
+public class StkMenuConfig {
+ private static final String LOG_TAG = "StkMenuConfig";
+ private static final boolean DBG = Build.IS_DEBUGGABLE;
+
+ private static final String XML_OPERATORS_TAG = "operators";
+ private static final String XML_OPERATOR_TAG = "operator";
+
+ private static final String XML_MCC_ATTR = "mcc";
+ private static final String XML_MNC_ATTR = "mnc";
+ private static final String XML_LABEL_ATTR = "label";
+ private static final String XML_ICON_ATTR = "icon";
+ private static final String RESOURCE_TYPE = "drawable";
+
+ private static final int UNSPECIFIED = -1;
+
+ private static final Config NO_CONFIG = new Config(0, 0, null, null);
+
+ private static final Object sLock = new Object();
+ private static StkMenuConfig sInstance;
+
+ private Context mContext;
+ private ArrayList<Config> mArray;
+ private Config mConfigs[] = null;
+
+ private static class Config {
+ public int mcc;
+ public int mnc;
+ public String label;
+ public String icon;
+
+ public Config(int mcc, int mnc, String label, String icon) {
+ this.mcc = mcc;
+ this.mnc = mnc;
+ this.label = label;
+ this.icon = icon;
+ }
+ }
+
+ public static StkMenuConfig getInstance(Context applicationContext) {
+ synchronized (sLock) {
+ if (sInstance == null) {
+ sInstance = new StkMenuConfig();
+ sInstance.initialize(applicationContext);
+ }
+ return sInstance;
+ }
+ }
+
+ /**
+ * Returns a preset label, if exists.
+ */
+ public String getLabel(int slotId) {
+ findConfig(slotId);
+
+ if (DBG) CatLog.d(LOG_TAG, "getLabel: " + mConfigs[slotId].label + ", slot id: " + slotId);
+ return mConfigs[slotId].label;
+ }
+
+ /**
+ * Returns a preset icon, if exists.
+ */
+ public Bitmap getIcon(int slotId) {
+ findConfig(slotId);
+
+ Bitmap bitmap = null;
+ if (mConfigs[slotId].icon != null) {
+ int resId = mContext.getResources().getIdentifier(mConfigs[slotId].icon,
+ RESOURCE_TYPE, mContext.getPackageName());
+ bitmap = resId == UNSPECIFIED ? null :
+ BitmapFactory.decodeResource(mContext.getResources(), resId);
+ }
+ if (DBG) CatLog.d(LOG_TAG, "getIcon: " + mConfigs[slotId].icon + ", slot id: " + slotId);
+ return bitmap;
+ }
+
+ private void findConfig(int slotId) {
+ int[] subId = SubscriptionManager.getSubId(slotId);
+ if (subId == null) {
+ mConfigs[slotId] = NO_CONFIG;
+ return;
+ }
+
+ TelephonyManager telephony =
+ (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
+ String operator = telephony.getSimOperator(subId[0]);
+ if (TextUtils.isEmpty(operator) || (operator.length() < 5)) {
+ mConfigs[slotId] = NO_CONFIG;
+ return;
+ }
+
+ int mcc = Integer.parseInt(operator.substring(0, 3));
+ int mnc = Integer.parseInt(operator.substring(3));
+
+ if (mConfigs[slotId] != null && mConfigs[slotId].mcc == mcc
+ && mConfigs[slotId].mnc == mnc) {
+ if (DBG) CatLog.d(LOG_TAG, "Return the cached config, slot id: " + slotId);
+ return;
+ }
+
+ if (DBG) CatLog.d(LOG_TAG, "Find config and create the cached config, slot id: " + slotId);
+ for (Config config : mArray) {
+ if ((config.mcc == mcc) && (config.mnc == mnc)) {
+ mConfigs[slotId] = config;
+ return;
+ }
+ }
+
+ mConfigs[slotId] = new Config(mcc, mnc, null, null);
+ }
+
+ private void initialize(Context context) {
+ mContext = context;
+ mArray = new ArrayList<Config>();
+ mConfigs = new Config[TelephonyManager.from(mContext).getSimCount()];
+
+ XmlResourceParser parser = mContext.getResources().getXml(R.xml.menu_conf);
+
+ try {
+ XmlUtils.beginDocument(parser, XML_OPERATORS_TAG);
+
+ do {
+ XmlUtils.nextElement(parser);
+
+ if (!XML_OPERATOR_TAG.equals(parser.getName())) {
+ break;
+ }
+
+ int mcc = parser.getAttributeIntValue(null, XML_MCC_ATTR, UNSPECIFIED);
+ int mnc = parser.getAttributeIntValue(null, XML_MNC_ATTR, UNSPECIFIED);
+
+ if ((mcc == UNSPECIFIED) || (mnc == UNSPECIFIED)) {
+ continue;
+ }
+
+ String label = parser.getAttributeValue(null, XML_LABEL_ATTR);
+ String icon = parser.getAttributeValue(null, XML_ICON_ATTR);
+
+ Config config = new Config(mcc, mnc, label, icon);
+ mArray.add(config);
+ } while (true);
+ } catch (Exception e) {
+ CatLog.e(LOG_TAG, "Something wrong happened while interpreting the xml file" + e);
+ } finally {
+ parser.close();
+ }
+ }
+}
diff --git a/src/com/android/stk/ToneDialog.java b/src/com/android/stk/ToneDialog.java
old mode 100644
new mode 100755
index 57a977d..f9b8754
--- a/src/com/android/stk/ToneDialog.java
+++ b/src/com/android/stk/ToneDialog.java
@@ -17,70 +17,52 @@
package com.android.stk;
import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
import android.content.Intent;
+import android.content.IntentFilter;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
-import android.os.Vibrator;
import android.view.KeyEvent;
+import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.android.internal.telephony.cat.CatLog;
import com.android.internal.telephony.cat.TextMessage;
-import com.android.internal.telephony.cat.ToneSettings;
+import com.android.internal.telephony.cat.CatLog;
/**
- * Activity used for PLAY TONE command.
+ * Activity used to display tone dialog.
*
*/
public class ToneDialog extends Activity {
TextMessage toneMsg = null;
- ToneSettings settings = null;
- TonePlayer player = null;
int mSlotId = -1;
- boolean mIsResponseSent = false;
private static final String LOG_TAG = new Object(){}.getClass().getEnclosingClass().getName();
- /**
- * Handler used to stop tones from playing when the duration ends.
- */
- Handler mToneStopper = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case MSG_ID_STOP_TONE:
- sendResponse(StkAppService.RES_ID_DONE);
- finish();
- break;
- }
- }
- };
-
- Vibrator mVibrator;
-
- // Message id to signal tone duration timeout.
- private static final int MSG_ID_STOP_TONE = 0xda;
-
@Override
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
CatLog.d(LOG_TAG, "onCreate");
- mVibrator = (Vibrator)getSystemService(VIBRATOR_SERVICE);
-
initFromIntent(getIntent());
+ // Register receiver
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(StkAppService.FINISH_TONE_ACTIVITY_ACTION);
+ registerReceiver(mFinishActivityReceiver, filter);
- // remove window title
- View title = findViewById(com.android.internal.R.id.title);
- title.setVisibility(View.GONE);
- // set customized content view
- setContentView(R.layout.stk_tone_dialog);
+ AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+ LayoutInflater inflater = this.getLayoutInflater();
+ View dialogView = inflater.inflate(R.layout.stk_tone_dialog, null);
+ alertDialogBuilder.setView(dialogView);
- TextView tv = (TextView) findViewById(R.id.message);
- ImageView iv = (ImageView) findViewById(R.id.icon);
+ TextView tv = (TextView) dialogView.findViewById(R.id.message);
+ ImageView iv = (ImageView) dialogView.findViewById(R.id.icon);
// set text and icon
if ((null == toneMsg) || (null == toneMsg.text) || (toneMsg.text.equals(""))) {
@@ -95,49 +77,24 @@
iv.setImageBitmap(toneMsg.icon);
}
- // Start playing tone and vibration
- if (null == settings) {
- CatLog.d(LOG_TAG, "onCreate - null settings - finish");
- finish();
- return;
- }
-
- player = new TonePlayer();
- player.play(settings.tone);
- int timeout = StkApp.calculateDurationInMilis(settings.duration);
- if (timeout == 0) {
- timeout = StkApp.TONE_DFEAULT_TIMEOUT;
- }
- mToneStopper.sendEmptyMessageDelayed(MSG_ID_STOP_TONE, timeout);
- if (settings.vibrate && mVibrator != null) {
- mVibrator.vibrate(timeout);
+ if (toneMsg.iconSelfExplanatory && toneMsg.icon != null) {
+ tv.setVisibility(View.GONE);
}
}
@Override
protected void onDestroy() {
- super.onDestroy();
CatLog.d(LOG_TAG, "onDestroy");
-
- mToneStopper.removeMessages(MSG_ID_STOP_TONE);
- if (!mIsResponseSent) {
- sendResponse(StkAppService.RES_ID_END_SESSION);
- }
-
- if (null != player) {
- player.stop();
- player.release();
- }
- if (null != mVibrator) {
- mVibrator.cancel();
- }
+ // Unregister receiver
+ unregisterReceiver(mFinishActivityReceiver);
+ super.onDestroy();
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
switch (keyCode) {
case KeyEvent.KEYCODE_BACK:
- sendResponse(StkAppService.RES_ID_END_SESSION);
+ sendStopTone();
finish();
break;
}
@@ -148,28 +105,38 @@
public boolean onTouchEvent(MotionEvent event) {
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
- sendResponse(StkAppService.RES_ID_END_SESSION);
+ sendStopTone();
finish();
return true;
}
return super.onTouchEvent(event);
}
+ private BroadcastReceiver mFinishActivityReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ // Intent received from StkAppService to finish ToneDialog activity,
+ // after finishing off playing the tone.
+ if (intent.getAction().equals(StkAppService.FINISH_TONE_ACTIVITY_ACTION)) {
+ CatLog.d(this, "Finishing Tone dialog activity");
+ finish();
+ }
+ }
+ };
+
private void initFromIntent(Intent intent) {
if (intent == null) {
finish();
}
toneMsg = intent.getParcelableExtra("TEXT");
- settings = intent.getParcelableExtra("TONE");
mSlotId = intent.getIntExtra(StkAppService.SLOT_ID, -1);
}
- private void sendResponse(int resId) {
+ // Send stop playing tone to StkAppService, when user presses back key.
+ private void sendStopTone() {
Bundle args = new Bundle();
- args.putInt(StkAppService.OPCODE, StkAppService.OP_RESPONSE);
+ args.putInt(StkAppService.OPCODE, StkAppService.OP_STOP_TONE_USER);
args.putInt(StkAppService.SLOT_ID, mSlotId);
- args.putInt(StkAppService.RES_ID, resId);
startService(new Intent(this, StkAppService.class).putExtras(args));
- mIsResponseSent = true;
}
}
