From 2fbfe0d9aca9b866491106561a6bf18cf713b3fe Mon Sep 17 00:00:00 2001 From: LineageOS Infra Date: Mon, 1 Apr 2024 12:02:39 +0000 Subject: [PATCH 1/2] Automatic translation import Change-Id: If9f804bec50b1ab6898c263604fce4a4ab4d5298 --- app/src/main/res/values-in/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 9140512c6..d2f65c89e 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -64,6 +64,7 @@ "Nama acara" "Lokasi" "Deskripsi" + "URL" "Tamu" "Acara dibuat." "Acara disimpan." @@ -128,6 +129,7 @@ "Detail" "Edit" "Hapus" + Gandakan Selesai Batal "Tutup semua" -- GitLab From 0831bf4f16f3f041ef23176e9dd0f902ea5bd225 Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Mon, 15 Apr 2024 02:29:56 +0000 Subject: [PATCH 2/2] 6430-t-Clear_notification_after_event_ends --- .../com/android/calendar/alerts/AlertService.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/android/calendar/alerts/AlertService.java b/app/src/main/java/com/android/calendar/alerts/AlertService.java index 5b639efe0..5008b950d 100644 --- a/app/src/main/java/com/android/calendar/alerts/AlertService.java +++ b/app/src/main/java/com/android/calendar/alerts/AlertService.java @@ -526,15 +526,13 @@ public class AlertService extends Service { int newState = -1; boolean newAlert = false; - // Uncomment for the behavior of clearing out alerts after the - // events ended. b/1880369 - // - // if (endTime < currentTime) { - // newState = CalendarAlerts.DISMISSED; - // } else + // clearing out alerts after the events ended. b/1880369 + if (endTime < currentTime) { + newState = CalendarAlerts.STATE_DISMISSED; + } // Remove declined events - boolean sendAlert = !declined; + boolean sendAlert = !declined && newState != CalendarAlerts.STATE_DISMISSED; // Check for experimental reminder settings. if (remindRespondedOnly) { // If the experimental setting is turned on, then only send @@ -922,7 +920,7 @@ public class AlertService extends Service { @Override public int onStartCommand(Intent intent, int flags, int startId) { if (intent != null) { - + Message msg = mServiceHandler.obtainMessage(); msg.arg1 = startId; msg.obj = intent.getExtras(); -- GitLab