Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b49ada7c authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'v1-t' into 'v2.0-t' 

Merge v1-t into v2.0-t

See merge request !64
parents 3f789db7 237d14ac

app/src/main/java/com/android/calendar/alerts/AlertService.java

+6 −8
Original line number Diff line number Diff line
@@ -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

app/src/main/res/values-in/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
    <string name="hint_what">"Nama acara"</string>

    <string name="hint_where">"Lokasi"</string>

    <string name="hint_description">"Deskripsi"</string>

    <string name="hint_url">"URL"</string>

    <string name="hint_attendees">"Tamu"</string>

    <string name="creating_event">"Acara dibuat."</string>

    <string name="saving_event">"Acara disimpan."</string>
@@ -128,6 +129,7 @@ 
    <string name="edit_event_label">"Detail"</string>

    <string name="edit_label">"Edit"</string>

    <string name="delete_label">"Hapus"</string>

    <string name="duplicate_label">Gandakan</string>

    <string name="save_label">Selesai</string>

    <string name="discard_label">Batal</string>

    <string name="dismiss_all_label">"Tutup semua"</string>