From 02fcde16adc9c2d99be8955a5c8a881e07055480 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sun, 2 Apr 2023 15:25:41 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ifa8fce85e4cd350e883a6a79452d5d73d4cc3a3c --- res/values-uz/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index 17fd2c9..bbabc14 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -32,7 +32,7 @@ "Qo‘ng‘iroq sozlanmoqda" "Ilova holati" "Yoniq" - "Yoqilmagan" + "Oʻchiq" "SIM menyusi" "Signal ijrosi" "Kanal ochilsinmi?" -- cgit v1.2.3 From 2e88a68ac3e11504057db045b7a5b29988d09f80 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 11 Apr 2023 12:26:35 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: If8314395ee4316fb32ee158b8dfb2d8585639d97 --- res/values-or/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index 9a5e748..a43640b 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -22,7 +22,7 @@ "ପଛକୁ" "ସେବାର ନାମ" "କୌଣସି ସେବା ଉପଲବ୍ଧ ନାହିଁ" - "ଠିକ୍‌ ଅଛି" + "ଠିକ ଅଛି" "ବାତିଲ କରନ୍ତୁ" "ହଁ" "ନା" -- cgit v1.2.3 From 3513e184ae6e98be13432f75177b22e7b408bda9 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 27 Apr 2023 12:39:18 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I23a36721cfcb6b70c47d8fc44dddf1d470b09a28 --- res/values-in/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index a3c33bc..3738f0b 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -32,7 +32,7 @@ "Panggilan yang sedang disiapkan" "Status aplikasi" "Diaktifkan" - "Dinonaktifkan" + "Nonaktif" "SIM ToolKit" "Memutar Nada" "Buka Saluran?" -- cgit v1.2.3 From d440997467db8721b392bd17b9d1e80ade684151 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sun, 28 May 2023 22:39:40 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I2e107dd4158062df64a5b1f79a6d78267f2af231 --- res/values-eu/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index e791e6d..4609345 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -41,6 +41,6 @@ "Kanala itxita dago" "BAI" "EZ" - "Sartu SIM txartela SIM tresnak abiarazteko." + "Sartu SIMa SIM tresnak abiarazteko." "Zerbitzu mugikorraren mezuak" -- cgit v1.2.3 From cb88cb2d791c2ca4424e811c3ccf766ce342619e Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 12 Jun 2023 10:35:54 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ifecc6dcbea96d20b0f9a771a1fbd5702fa1175ab --- res/values-ne/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 4b0be8d..d4a47da 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -42,5 +42,5 @@ "हो" "होइन" "SIM टुलकिट लञ्च गर्न कृपया SIM घुसाउनुहोस्।" - "मोबाइल सेवाका सन्देशहरू" + "मोबाइल सेवाका म्यासेजहरू" -- cgit v1.2.3 From 875d947f02d576f396a0b45326a2471cd4e4ecae Mon Sep 17 00:00:00 2001 From: arunvoddu Date: Tue, 12 Sep 2023 12:23:44 +0000 Subject: Added notification pendingIntent to handle the click event. Handles to show the unlock screen if the device is screen locked. Please refer to bug for demo videos Bug: 285328495 Test: Verified manually that on stk app notification click, it is asking to unlock the device. Change-Id: I63be4b7e35080f9a8eea6e9f35143bd78b82c4a2 --- AndroidManifest.xml | 6 ++++ src/com/android/stk/StkAppService.java | 47 ++++++++-------------------- src/com/android/stk/UserPresentReceiver.java | 35 +++++++++++++++++++++ 3 files changed, 54 insertions(+), 34 deletions(-) create mode 100644 src/com/android/stk/UserPresentReceiver.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 348e798..d8aff68 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -130,6 +130,12 @@ + + + + + diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java index 52b06fb..4d26fa6 100644 --- a/src/com/android/stk/StkAppService.java +++ b/src/com/android/stk/StkAppService.java @@ -74,7 +74,6 @@ 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.CatCmdMessage; @@ -300,6 +299,7 @@ public class StkAppService extends Service implements Runnable { private static final String SYSTEM_DIALOG_REASON_HOME_KEY = "homekey"; private static final String SYSTEM_DIALOG_REASON_RECENTAPPS_KEY = "recentapps"; private BroadcastReceiver mHomeKeyEventReceiver = null; + private static final int NOTIFICATION_PENDING_INTENT_REQUEST_CODE = 0; @Override public void onCreate() { @@ -1690,47 +1690,26 @@ public class StkAppService extends Service implements Runnable { builder.setOnlyAlertOnce(true); builder.setColor(getResources().getColor( com.android.internal.R.color.system_notification_accent_color)); - - registerUserPresentReceiver(); + Intent userPresentIntent = new Intent(mContext, UserPresentReceiver.class); + userPresentIntent.setAction(Intent.ACTION_USER_PRESENT); + PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, + NOTIFICATION_PENDING_INTENT_REQUEST_CODE, userPresentIntent, + PendingIntent.FLAG_IMMUTABLE); + builder.setContentIntent(pendingIntent); mNotificationManager.notify(getNotificationId(NOTIFICATION_ON_KEYGUARD, slotId), builder.build()); mStkContext[slotId].mNotificationOnKeyguard = true; } - private void cancelNotificationOnKeyguard(int slotId) { - mNotificationManager.cancel(getNotificationId(NOTIFICATION_ON_KEYGUARD, slotId)); - mStkContext[slotId].mNotificationOnKeyguard = false; - unregisterUserPresentReceiver(slotId); - } - - private synchronized void registerUserPresentReceiver() { - if (mUserPresentReceiver == null) { - mUserPresentReceiver = new BroadcastReceiver() { - @Override public void onReceive(Context context, Intent intent) { - if (Intent.ACTION_USER_PRESENT.equals(intent.getAction())) { - for (int slot = 0; slot < mSimCount; slot++) { - cancelNotificationOnKeyguard(slot); - } - } - } - }; - registerReceiver(mUserPresentReceiver, new IntentFilter(Intent.ACTION_USER_PRESENT)); + public void cancelNotificationOnKeyguard() { + for (int slot = 0; slot < mSimCount; slot++) { + cancelNotificationOnKeyguard(slot); } } - private synchronized void unregisterUserPresentReceiver(int slotId) { - if (mUserPresentReceiver != null) { - for (int slot = 0; slot < mSimCount; slot++) { - if (slot != slotId) { - if (mStkContext[slot].mNotificationOnKeyguard) { - // The broadcast receiver is still necessary for other SIM card. - return; - } - } - } - unregisterReceiver(mUserPresentReceiver); - mUserPresentReceiver = null; - } + private void cancelNotificationOnKeyguard(int slotId) { + mNotificationManager.cancel(getNotificationId(NOTIFICATION_ON_KEYGUARD, slotId)); + mStkContext[slotId].mNotificationOnKeyguard = false; } private int getNotificationId(int notificationType, int slotId) { diff --git a/src/com/android/stk/UserPresentReceiver.java b/src/com/android/stk/UserPresentReceiver.java new file mode 100644 index 0000000..25c945c --- /dev/null +++ b/src/com/android/stk/UserPresentReceiver.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2023 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.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import com.android.internal.telephony.cat.CatLog; + +public class UserPresentReceiver extends BroadcastReceiver { + + private static final String LOG_TAG = UserPresentReceiver.class.getSimpleName(); + + @Override + public void onReceive(Context context, Intent intent) { + if (Intent.ACTION_USER_PRESENT.equals(intent.getAction())) { + CatLog.d(LOG_TAG, "Broadcast received and clearing the notification"); + StkAppService.getInstance().cancelNotificationOnKeyguard(); + } + } +} -- cgit v1.2.3 From 1f5058c749ff35b066ee04e5e21fccaaedc30754 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 2 Oct 2023 04:21:16 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I42dceed94692e706bc366aa098beb010f51e2368 --- res/values-eu/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 4609345..da8762c 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -41,6 +41,6 @@ "Kanala itxita dago" "BAI" "EZ" - "Sartu SIMa SIM tresnak abiarazteko." + "Sartu SIMa SIM tresnak exekutatzeko." "Zerbitzu mugikorraren mezuak" -- cgit v1.2.3