diff --git a/Android.bp b/Android.bp
index f041f41..cffb421 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,21 +1,10 @@
 // Copyright 2007-2008 The Android Open Source Project
 
 android_app {
-    name: "StkLib",
+    name: "Stk",
     libs: ["telephony-common"],
     static_libs: ["com.google.android.material_material"],
     srcs: ["**/*.java"],
     platform_apis: true,
     certificate: "platform",
-    aaptflags: [
-        "--shared-lib",
-        "--extra-packages com.android.stk",
-    ],
-    export_package_resources: true,
-    optimize: {
-        proguard_flags_files: [
-            "proguard.proguard",
-        ],
-    },
-    apex_available: [ "com.android.telephony" ],
 }
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1a6af77..c49ff86 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,10 +16,116 @@
 
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.stk.lib">
+        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+        package="com.android.stk"
+        android:sharedUserId="android.uid.phone">
 
-    <application>
-        <library android:name="com.android.stk.lib" />
+    <original-package android:name="com.android.stk" />
+
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.GET_TASKS"/>
+    <uses-permission android:name="android.permission.RECEIVE_STK_COMMANDS" />
+    <uses-permission android:name="android.permission.SET_ACTIVITY_WATCHER" />
+    <uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
+    <uses-permission android:name="android.permission.USER_ACTIVITY" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <application android:icon="@drawable/ic_launcher_sim_toolkit"
+        android:label="@string/app_name"
+        android:clearTaskOnLaunch="true"
+        android:process="com.android.phone"
+        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:autoRemoveFromRecents="true"
+            android:taskAffinity="android.task.stk.StkLauncherActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="StkLauncherActivity"
+            android:theme="@android:style/Theme.DeviceDefault.DayNight"
+            android:label="@string/app_name"
+            android:exported="false"
+            android:autoRemoveFromRecents="true"
+            android:taskAffinity="android.task.stk.StkLauncherActivity">
+            <intent-filter>
+                 <action android:name="android.intent.action.VIEW" />
+                 <action android:name="android.intent.action.PICK" />
+                 <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="StkMenuActivity"
+            android:theme="@android:style/Theme.DeviceDefault.DayNight"
+            android:icon="@drawable/ic_launcher_sim_toolkit"
+            android:label="@string/app_name"
+            android:configChanges="orientation|locale|screenSize|keyboardHidden|mnc|mcc"
+            android:exported="false"
+            android:autoRemoveFromRecents="true"
+            android:taskAffinity="android.task.stk.StkLauncherActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.PICK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="StkInputActivity"
+            android:label="@string/app_name"
+            android:icon="@drawable/ic_launcher_sim_toolkit"
+            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"
+            android:configChanges="orientation|locale|screenSize|keyboardHidden"
+            android:exported="false"
+            android:autoRemoveFromRecents="true"
+            android:taskAffinity="android.task.stk.StkLauncherActivity">
+                <intent-filter>
+                        <action android:name="android.intent.action.VIEW" />
+                        <action android:name="android.intent.action.EDIT" />
+                        <category android:name="android.intent.category.DEFAULT" />
+                </intent-filter>
+        </activity>
+        <activity android:name="StkDialogActivity"
+            android:configChanges="orientation|locale|screenSize|keyboardHidden"
+            android:theme="@style/Transparent"
+            android:exported="false"
+            android:autoRemoveFromRecents="true"
+            android:taskAffinity="android.task.stk.StkLauncherActivity">
+        </activity>
+
+        <activity android:name="ToneDialog"
+            android:exported="false"
+            android:theme="@style/Transparent"
+            android:autoRemoveFromRecents="true"
+            android:taskAffinity="android.task.stk.StkLauncherActivity">
+        </activity>
+
+        <receiver android:name="com.android.stk.StkCmdReceiver">
+            <intent-filter>
+                <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" />
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name="com.android.stk.BootCompletedReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.USER_INITIALIZE" />
+            </intent-filter>
+        </receiver>
+
+        <service android:name="StkAppService" />
+
     </application>
-
 </manifest>
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 5c0114b..3c98e58 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -48,3 +48,4 @@
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/StkLib)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/StkLib)
diff --git a/OWNERS b/OWNERS
index 75ee354..3059d4d 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,6 +1,15 @@
 amitmahajan@google.com
-rgreenwalt@google.com
-jminjie@google.com
-hallliu@google.com
 breadley@google.com
-jackyu@google.com
\ No newline at end of file
+fionaxu@google.com
+jackyu@google.com
+hallliu@google.com
+rgreenwalt@google.com
+tgunn@google.com
+jminjie@google.com
+shuoq@google.com
+refuhoo@google.com
+nazaninb@google.com
+sarahchin@google.com
+dbright@google.com
+xiaotonj@google.com
+
diff --git a/client/Android.bp b/client/Android.bp
deleted file mode 100644
index 45896e3..0000000
--- a/client/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2007-2008 The Android Open Source Project
-
-android_app {
-    name: "Stk",
-    static_libs: ["com.google.android.material_material"],
-    platform_apis: true,
-    certificate: "platform",
-    required: ["StkLib"],
-}
diff --git a/client/AndroidManifest.xml b/client/AndroidManifest.xml
deleted file mode 100644
index bf9604c..0000000
--- a/client/AndroidManifest.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?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.
--->
-
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-        package="com.android.stk"
-        android:sharedUserId="android.uid.phone">
-
-    <original-package android:name="com.android.stk" />
-
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.GET_TASKS"/>
-    <uses-permission android:name="android.permission.RECEIVE_STK_COMMANDS" />
-    <uses-permission android:name="android.permission.SET_ACTIVITY_WATCHER" />
-    <uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
-    <uses-permission android:name="android.permission.USER_ACTIVITY" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <application android:icon="@drawable/ic_launcher_sim_toolkit"
-        android:label="@string/app_name"
-        android:clearTaskOnLaunch="true"
-        android:process="com.android.phone"
-        android:taskAffinity="android.task.stk"
-        android:defaultToDeviceProtectedStorage="true"
-        android:directBootAware="true">
-
-        <uses-library android:name="com.android.stk.lib" />
-
-        <activity android:name="StkMain"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:label="@string/app_name"
-            android:enabled="false"
-            android:exported="true"
-            android:autoRemoveFromRecents="true"
-            android:taskAffinity="android.task.stk.StkLauncherActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="StkLauncherActivity"
-            android:theme="@android:style/Theme.DeviceDefault.DayNight"
-            android:label="@string/app_name"
-            android:exported="false"
-            android:autoRemoveFromRecents="true"
-            android:taskAffinity="android.task.stk.StkLauncherActivity">
-            <intent-filter>
-                 <action android:name="android.intent.action.VIEW" />
-                 <action android:name="android.intent.action.PICK" />
-                 <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="StkMenuActivity"
-            android:theme="@android:style/Theme.DeviceDefault.DayNight"
-            android:icon="@drawable/ic_launcher_sim_toolkit"
-            android:label="@string/app_name"
-            android:configChanges="orientation|locale|screenSize|keyboardHidden|mnc|mcc"
-            android:exported="false"
-            android:autoRemoveFromRecents="true"
-            android:taskAffinity="android.task.stk.StkLauncherActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.intent.action.PICK" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="StkInputActivity"
-            android:label="@string/app_name"
-            android:icon="@drawable/ic_launcher_sim_toolkit"
-            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"
-            android:configChanges="orientation|locale|screenSize|keyboardHidden"
-            android:exported="false"
-            android:autoRemoveFromRecents="true"
-            android:taskAffinity="android.task.stk.StkLauncherActivity">
-                <intent-filter>
-                        <action android:name="android.intent.action.VIEW" />
-                        <action android:name="android.intent.action.EDIT" />
-                        <category android:name="android.intent.category.DEFAULT" />
-                </intent-filter>
-        </activity>
-        <activity android:name="StkDialogActivity"
-            android:configChanges="orientation|locale|screenSize|keyboardHidden"
-            android:theme="@style/Transparent"
-            android:exported="false"
-            android:autoRemoveFromRecents="true"
-            android:taskAffinity="android.task.stk.StkLauncherActivity">
-        </activity>
-
-        <activity android:name="ToneDialog"
-            android:exported="false"
-            android:theme="@style/Transparent"
-            android:autoRemoveFromRecents="true"
-            android:taskAffinity="android.task.stk.StkLauncherActivity">
-        </activity>
-
-        <receiver android:name="com.android.stk.StkCmdReceiver">
-            <intent-filter>
-                <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" />
-            </intent-filter>
-        </receiver>
-
-        <receiver android:name="com.android.stk.BootCompletedReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.USER_INITIALIZE" />
-            </intent-filter>
-        </receiver>
-
-        <service android:name="StkAppService" />
-
-    </application>
-</manifest>
diff --git a/client/res/drawable-hdpi/ic_launcher_sim_toolkit.png b/client/res/drawable-hdpi/ic_launcher_sim_toolkit.png
deleted file mode 100644
index d6ebaaf..0000000
--- a/client/res/drawable-hdpi/ic_launcher_sim_toolkit.png
+++ /dev/null
Binary files differ
diff --git a/client/res/drawable-mdpi/ic_launcher_sim_toolkit.png b/client/res/drawable-mdpi/ic_launcher_sim_toolkit.png
deleted file mode 100644
index 9ff189f..0000000
--- a/client/res/drawable-mdpi/ic_launcher_sim_toolkit.png
+++ /dev/null
Binary files differ
diff --git a/client/res/drawable-xhdpi/ic_launcher_sim_toolkit.png b/client/res/drawable-xhdpi/ic_launcher_sim_toolkit.png
deleted file mode 100644
index fcc57be..0000000
--- a/client/res/drawable-xhdpi/ic_launcher_sim_toolkit.png
+++ /dev/null
Binary files differ
diff --git a/client/res/drawable-xxhdpi/ic_launcher_sim_toolkit.png b/client/res/drawable-xxhdpi/ic_launcher_sim_toolkit.png
deleted file mode 100644
index 9aed66b..0000000
--- a/client/res/drawable-xxhdpi/ic_launcher_sim_toolkit.png
+++ /dev/null
Binary files differ
diff --git a/client/res/drawable-xxxhdpi/ic_launcher_sim_toolkit.png b/client/res/drawable-xxxhdpi/ic_launcher_sim_toolkit.png
deleted file mode 100644
index b56c624..0000000
--- a/client/res/drawable-xxxhdpi/ic_launcher_sim_toolkit.png
+++ /dev/null
Binary files differ
diff --git a/client/res/values/strings.xml b/client/res/values/strings.xml
deleted file mode 100644
index adf1605..0000000
--- a/client/res/values/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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>
-    <!-- Default Application label used on home screen with an icon -->
-    <string name="app_name">SIM Toolkit</string>
-</resources>
diff --git a/client/res/values/styles.xml b/client/res/values/styles.xml
deleted file mode 100644
index 7d43798..0000000
--- a/client/res/values/styles.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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>
-    <style name="Transparent" parent="@android:style/Theme.DeviceDefault.DayNight">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">true</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-    </style>
-</resources>
diff --git a/proguard.proguard b/proguard.proguard
deleted file mode 100644
index 2a823d8..0000000
--- a/proguard.proguard
+++ /dev/null
@@ -1,7 +0,0 @@
--keepparameternames
--keepattributes Exceptions,InnerClasses,Signature,Deprecated,
-                SourceFile,LineNumberTable,*Annotation*,EnclosingMethod
-
--keep public class * {
-    public protected *;
-}
\ No newline at end of file
diff --git a/res/drawable-hdpi/stat_notify_sim_toolkit.png b/res/drawable-hdpi/stat_notify_sim_toolkit.png
new file mode 100644
index 0000000..a357251
--- /dev/null
+++ b/res/drawable-hdpi/stat_notify_sim_toolkit.png
Binary files differ
diff --git a/res/drawable-ldpi/stat_notify_sim_toolkit.png b/res/drawable-ldpi/stat_notify_sim_toolkit.png
new file mode 100644
index 0000000..d9a62a9
--- /dev/null
+++ b/res/drawable-ldpi/stat_notify_sim_toolkit.png
Binary files differ
diff --git a/res/drawable-mdpi/stat_notify_sim_toolkit.png b/res/drawable-mdpi/stat_notify_sim_toolkit.png
new file mode 100644
index 0000000..6a774cf
--- /dev/null
+++ b/res/drawable-mdpi/stat_notify_sim_toolkit.png
Binary files differ
diff --git a/res/drawable-xhdpi/stat_notify_sim_toolkit.png b/res/drawable-xhdpi/stat_notify_sim_toolkit.png
new file mode 100644
index 0000000..9e1df72
--- /dev/null
+++ b/res/drawable-xhdpi/stat_notify_sim_toolkit.png
Binary files differ
diff --git a/res/drawable-xxhdpi/stat_notify_sim_toolkit.png b/res/drawable-xxhdpi/stat_notify_sim_toolkit.png
new file mode 100644
index 0000000..d1cf3d7
--- /dev/null
+++ b/res/drawable-xxhdpi/stat_notify_sim_toolkit.png
Binary files differ
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 5b17537..5adf46e 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -22,7 +22,7 @@
     <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_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>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d61ed31..39b75f0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -22,7 +22,7 @@
     <string name="menu_back" msgid="301227740977453364">"Zurück"</string>
     <string name="service_name" msgid="6860303747999592491">"Name des Dienstes"</string>
     <string name="stk_no_service" msgid="5427773116839809131">"Kein Dienst verfügbar"</string>
-    <string name="button_ok" msgid="5760722312558549555">"OK"</string>
+    <string name="button_ok" msgid="5760722312558549555">"Ok"</string>
     <string name="button_cancel" msgid="1997847915560800261">"Abbrechen"</string>
     <string name="button_yes" msgid="624420260648337203">"\"Ja\""</string>
     <string name="button_no" msgid="1824959157582605627">"Nein"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 5b38f4b..8ace2a1 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/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">"सिम टूलकिट"</string>
-    <string name="menu_end_session" msgid="7368541737750982217">"सत्र समाप्त करें"</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>
@@ -30,14 +30,14 @@
     <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>
+    <string name="default_receive_data_msg" msgid="618096941772010682">"डेटा मिल रहा है"</string>
     <string name="default_close_channel_msg" msgid="765364262263839824">"चैनल बंद हो गया"</string>
     <string name="stk_dialog_accept" msgid="8498901537508923727">"हां"</string>
     <string name="stk_dialog_reject" msgid="921848059485746796">"नहीं"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 81b4243..c468d74 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/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">"Alatni komplet za SIM"</string>
+    <string name="app_name" msgid="8396461461738434341">"Alati za SIM"</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">"Natrag"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 9c7c290..fe06396 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/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 kártya eszközkészlete"</string>
+    <string name="app_name" msgid="8396461461738434341">"SIM-kártya eszközkészlete"</string>
     <string name="menu_end_session" msgid="7368541737750982217">"Munkamenet befejezése"</string>
     <string name="help" msgid="9209980881219397319">"Súgó"</string>
     <string name="menu_back" msgid="301227740977453364">"Vissza"</string>
@@ -33,7 +33,7 @@
     <string name="stk_app_state" msgid="18582277302584082">"Alkalmazás állapota"</string>
     <string name="enable_app" msgid="3701224550936728203">"Engedélyezve"</string>
     <string name="disable_app" msgid="6725081975611415214">"Letiltva"</string>
-    <string name="stk_dialog_title" msgid="6954825385456886726">"SIM kártya eszközkészlete"</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>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index c030ff5..ddb76fa 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/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">"SIM Toolkit"</string>
     <string name="menu_end_session" msgid="7368541737750982217">"Сессияны аяқтау"</string>
     <string name="help" msgid="9209980881219397319">"Көмек"</string>
     <string name="menu_back" msgid="301227740977453364">"Артқа"</string>
@@ -33,7 +33,7 @@
     <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">"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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5ed9a87..ebe14b9 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="8396461461738434341">"SIM-toolkit"</string>
     <string name="menu_end_session" msgid="7368541737750982217">"Sessie beëindigen"</string>
-    <string name="help" msgid="9209980881219397319">"Help"</string>
+    <string name="help" msgid="9209980881219397319">"Hulp"</string>
     <string name="menu_back" msgid="301227740977453364">"Terug"</string>
     <string name="service_name" msgid="6860303747999592491">"Servicenaam"</string>
     <string name="stk_no_service" msgid="5427773116839809131">"Geen service beschikbaar"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 01eb52f..0440ce9 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -30,7 +30,7 @@
     <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>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index d9ecefb..6793f15 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -32,7 +32,7 @@
     <string name="default_setup_call_msg" msgid="6126904475461162162">"Qo‘ng‘iroq sozlanmoqda"</string>
     <string name="stk_app_state" msgid="18582277302584082">"Ilova holati"</string>
     <string name="enable_app" msgid="3701224550936728203">"Yoniq"</string>
-    <string name="disable_app" msgid="6725081975611415214">"O‘chiq"</string>
+    <string name="disable_app" msgid="6725081975611415214">"Yoqilmagan"</string>
     <string name="stk_dialog_title" msgid="6954825385456886726">"SIM menyusi"</string>
     <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Signal ijrosi"</string>
     <string name="default_open_channel_msg" msgid="2216070254100295924">"Kanal ochilsinmi?"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 59db8c4..1169b6b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/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">"SIM 卡工具包"</string>
     <string name="menu_end_session" msgid="7368541737750982217">"结束会话"</string>
     <string name="help" msgid="9209980881219397319">"帮助"</string>
     <string name="menu_back" msgid="301227740977453364">"返回"</string>
@@ -33,7 +33,7 @@
     <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">"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>
diff --git a/res/values/config.xml b/res/values/config.xml
index d5f912e..2636db6 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -17,4 +17,14 @@
 <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>
+
+    <!-- set to false if we need to show user confirmation
+     when alpha identifier is not provided by the UICC -->
+    <bool name="config_stkNoAlphaUsrCnf">true</bool>
+
+    <!-- Flag indicating whether the surface flinger is inefficient
+     at performing a blur.  Used by parts of the UI to turn off
+     the blur effect where it isn't worth the performance hit.
+     As of Honeycomb, blurring is not supported anymore. -->
+    <bool name="config_sf_slowBlur">true</bool>
 </resources>
diff --git a/src/com/android/stk/StkAppInstaller.java b/src/com/android/stk/StkAppInstaller.java
index 50bc96e..4e386ee 100644
--- a/src/com/android/stk/StkAppInstaller.java
+++ b/src/com/android/stk/StkAppInstaller.java
@@ -18,7 +18,6 @@
 
 import com.android.internal.telephony.cat.CatLog;
 import com.android.internal.telephony.PhoneConstants;
-import com.android.internal.telephony.TelephonyProperties;
 
 import android.content.ComponentName;
 import android.content.Context;
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index 0543a24..9f86610 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -16,6 +16,11 @@
 
 package com.android.stk;
 
+import static com.android.internal.telephony.cat.CatCmdMessage.SetupEventListConstants.IDLE_SCREEN_AVAILABLE_EVENT;
+import static com.android.internal.telephony.cat.CatCmdMessage.SetupEventListConstants.LANGUAGE_SELECTION_EVENT;
+import static com.android.internal.telephony.cat.CatCmdMessage.SetupEventListConstants.USER_ACTIVITY_EVENT;
+
+import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningTaskInfo;
 import android.app.AlertDialog;
@@ -26,16 +31,13 @@
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
-import android.app.Activity;
-import android.app.IProcessObserver;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.Resources.NotFoundException;
 import android.graphics.Bitmap;
@@ -50,58 +52,47 @@
 import android.os.PersistableBundle;
 import android.os.PowerManager;
 import android.os.RemoteException;
-import android.os.ServiceManager;
 import android.os.SystemProperties;
 import android.os.Vibrator;
 import android.provider.Settings;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyFrameworkInitializer;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.view.Gravity;
-import android.view.IWindowManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager;
-import android.view.WindowManagerPolicyConstants;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.content.IntentFilter;
 
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import com.android.internal.telephony.GsmAlphabet;
+import com.android.internal.telephony.ITelephony;
 import com.android.internal.telephony.PhoneConfigurationManager;
+import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.cat.AppInterface;
-import com.android.internal.telephony.cat.Input;
-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.ResultCode;
 import com.android.internal.telephony.cat.CatCmdMessage;
 import com.android.internal.telephony.cat.CatCmdMessage.BrowserSettings;
 import com.android.internal.telephony.cat.CatCmdMessage.SetupEventListSettings;
 import com.android.internal.telephony.cat.CatLog;
 import com.android.internal.telephony.cat.CatResponseMessage;
+import com.android.internal.telephony.cat.CatService;
+import com.android.internal.telephony.cat.Input;
+import com.android.internal.telephony.cat.Item;
+import com.android.internal.telephony.cat.Menu;
+import com.android.internal.telephony.cat.ResultCode;
 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.PhoneConstants;
-import com.android.internal.telephony.GsmAlphabet;
-import com.android.internal.telephony.cat.CatService;
 
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.regex.Pattern;
-
-import static com.android.internal.telephony.cat.CatCmdMessage.
-                   SetupEventListConstants.IDLE_SCREEN_AVAILABLE_EVENT;
-import static com.android.internal.telephony.cat.CatCmdMessage.
-                   SetupEventListConstants.LANGUAGE_SELECTION_EVENT;
-import static com.android.internal.telephony.cat.CatCmdMessage.
-                   SetupEventListConstants.USER_ACTIVITY_EVENT;
-
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 /**
  * SIM toolkit application level service. Interacts with Telephopny messages,
@@ -1691,7 +1682,7 @@
             builder.setContentTitle(menu.title);
         }
 
-        builder.setSmallIcon(com.android.internal.R.drawable.stat_notify_sim_toolkit);
+        builder.setSmallIcon(R.drawable.stat_notify_sim_toolkit);
         builder.setOngoing(true);
         builder.setOnlyAlertOnce(true);
         builder.setColor(getResources().getColor(
@@ -1823,7 +1814,7 @@
         if (mUserActivityReceiver == null) {
             mUserActivityReceiver = new BroadcastReceiver() {
                 @Override public void onReceive(Context context, Intent intent) {
-                    if (WindowManagerPolicyConstants.ACTION_USER_ACTIVITY_NOTIFICATION.equals(
+                    if (TelephonyIntents.ACTION_USER_ACTIVITY_NOTIFICATION.equals(
                             intent.getAction())) {
                         Message message = mServiceHandler.obtainMessage(OP_USER_ACTIVITY);
                         mServiceHandler.sendMessage(message);
@@ -1832,11 +1823,14 @@
                 }
             };
             registerReceiver(mUserActivityReceiver, new IntentFilter(
-                    WindowManagerPolicyConstants.ACTION_USER_ACTIVITY_NOTIFICATION));
+                    TelephonyIntents.ACTION_USER_ACTIVITY_NOTIFICATION));
             try {
-                IWindowManager wm = IWindowManager.Stub.asInterface(
-                        ServiceManager.getService(Context.WINDOW_SERVICE));
-                wm.requestUserActivityNotification();
+                ITelephony telephony = ITelephony.Stub.asInterface(
+                        TelephonyFrameworkInitializer
+                                .getTelephonyServiceManager()
+                                .getTelephonyServiceRegisterer()
+                                .get());
+                telephony.requestUserActivityNotification();
             } catch (RemoteException e) {
                 CatLog.e(LOG_TAG, "failed to init WindowManager:" + e);
             }
@@ -2155,7 +2149,7 @@
                 notificationBuilder.setContentTitle("");
             }
             notificationBuilder
-                    .setSmallIcon(com.android.internal.R.drawable.stat_notify_sim_toolkit);
+                    .setSmallIcon(R.drawable.stat_notify_sim_toolkit);
             notificationBuilder.setContentIntent(pendingIntent);
             notificationBuilder.setOngoing(true);
             notificationBuilder.setOnlyAlertOnce(true);
@@ -2172,7 +2166,7 @@
             } else {
                 Bitmap bitmapIcon = BitmapFactory.decodeResource(StkAppService.this
                     .getResources().getSystem(),
-                    com.android.internal.R.drawable.stat_notify_sim_toolkit);
+                    R.drawable.stat_notify_sim_toolkit);
                 notificationBuilder.setLargeIcon(bitmapIcon);
             }
             notificationBuilder.setColor(mContext.getResources().getColor(
@@ -2223,7 +2217,7 @@
         Resources resource = Resources.getSystem();
         try {
             displayDialog = !resource.getBoolean(
-                    com.android.internal.R.bool.config_stkNoAlphaUsrCnf);
+                    R.bool.config_stkNoAlphaUsrCnf);
         } catch (NotFoundException e) {
             displayDialog = true;
         }
@@ -2369,7 +2363,7 @@
 
         dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
         if (!mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_sf_slowBlur)) {
+                R.bool.config_sf_slowBlur)) {
             dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
         }
 
@@ -2398,8 +2392,7 @@
                     .create();
 
         dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
-        if (!mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_sf_slowBlur)) {
+        if (!mContext.getResources().getBoolean(R.bool.config_sf_slowBlur)) {
             dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
         }
 
diff --git a/src/com/android/stk/StkInputActivity.java b/src/com/android/stk/StkInputActivity.java
index fe16101..0af6767 100644
--- a/src/com/android/stk/StkInputActivity.java
+++ b/src/com/android/stk/StkInputActivity.java
@@ -105,18 +105,22 @@
             return;
         }
 
-        if (v.getId() == R.id.button_ok) {
+        switch (v.getId()) {
+        case R.id.button_ok:
             input = mTextIn.getText().toString();
-        } else if (v.getId() == R.id.button_cancel) {
+            break;
+        case R.id.button_cancel:
             sendResponse(StkAppService.RES_ID_END_SESSION);
             finish();
             return;
-            // Yes/No layout buttons.
-        } else if (v.getId() == R.id.button_yes) {
+        // Yes/No layout buttons.
+        case R.id.button_yes:
             input = YES_STR_RESPONSE;
-        } else if (v.getId() == R.id.button_no) {
+            break;
+        case R.id.button_no:
             input = NO_STR_RESPONSE;
-        } else if (v.getId() == R.id.more) {
+            break;
+        case R.id.more:
             if (mPopupMenu == null) {
                 mPopupMenu = new PopupMenu(this, v);
                 Menu menu = mPopupMenu.getMenu();
@@ -136,6 +140,8 @@
                 mPopupMenu.show();
             }
             return;
+        default:
+            break;
         }
         CatLog.d(LOG_TAG, "handleClick, ready to response");
         sendResponse(StkAppService.RES_ID_INPUT, input, false);