mirror of
https://github.com/Etar-Group/Etar-Calendar.git
synced 2024-10-26 11:57:31 +03:00
Fix task stack building on ICS
Change-Id: I2f4ed27c49d339ceb4424cfe7457e645c9cc2ad6
This commit is contained in:
parent
c0feea05e0
commit
bb768dfe3a
@ -21,6 +21,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src)
|
||||
LOCAL_STATIC_JAVA_LIBRARIES := \
|
||||
android-common \
|
||||
android-common-chips \
|
||||
android-support-v4 \
|
||||
calendar-common
|
||||
LOCAL_SDK_VERSION := current
|
||||
|
||||
|
@ -86,6 +86,8 @@
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<data android:mimeType="vnd.android.cursor.item/event" />
|
||||
</intent-filter>
|
||||
<meta-data android:name="android.support.PARENT_ACTIVITY"
|
||||
android:value="com.android.calendar.AllInOneActivity" />
|
||||
</activity>
|
||||
|
||||
<activity android:name=".event.EditEventActivity"
|
||||
|
@ -18,7 +18,6 @@ package com.android.calendar.alerts;
|
||||
|
||||
import android.app.IntentService;
|
||||
import android.app.NotificationManager;
|
||||
import android.app.TaskStackBuilder;
|
||||
import android.content.ContentResolver;
|
||||
import android.content.ContentValues;
|
||||
import android.content.Context;
|
||||
@ -26,9 +25,9 @@ import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.os.IBinder;
|
||||
import android.provider.CalendarContract.CalendarAlerts;
|
||||
import android.support.v4.app.TaskStackBuilder;
|
||||
|
||||
import com.android.calendar.EventInfoActivity;
|
||||
import com.android.calendar.Utils;
|
||||
|
||||
/**
|
||||
* Service for asynchronously marking fired alarms as dismissed.
|
||||
@ -88,14 +87,8 @@ public class DismissAlarmsService extends IntentService {
|
||||
// EventInfoActivity with AllInOneActivity as the parent activity rooted to home.
|
||||
Intent i = AlertUtils.buildEventViewIntent(this, eventId, eventStart, eventEnd);
|
||||
|
||||
if (Utils.isJellybeanOrLater()) {
|
||||
TaskStackBuilder.create(this).addParentStack(EventInfoActivity.class)
|
||||
.addNextIntent(i).startActivities();
|
||||
} else {
|
||||
// This is a workaround until 6650578 is resolved
|
||||
i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
startActivity(i);
|
||||
}
|
||||
TaskStackBuilder.create(this)
|
||||
.addParentStack(EventInfoActivity.class).addNextIntent(i).startActivities();
|
||||
}
|
||||
|
||||
// Stop this service
|
||||
|
Loading…
Reference in New Issue
Block a user