diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-11 21:18:28 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-11 21:18:28 +0000 |
| commit | 15d65ede5806793f4ebdf8c1d998f10a410095eb (patch) | |
| tree | a65cd079bf95c1b2c974179f431b980e068b1e30 | |
| parent | f581e07882aab558bd36a681a1dcfac1b0b04caf (diff) | |
| parent | 39a9ebe5c53026006fc777739ba25b067eb417a8 (diff) | |
| download | Calendar-15d65ede5806793f4ebdf8c1d998f10a410095eb.tar.gz | |
Snap for 6001391 from 39a9ebe5c53026006fc777739ba25b067eb417a8 to qt-aml-tzdata-release
Change-Id: I5d2ad9eb2a45121f621825f76bb606cf22d3ab25
| -rw-r--r-- | AndroidManifest.xml | 21 | ||||
| -rw-r--r-- | src/com/android/calendar/widget/CalendarAppWidgetProvider.java | 4 |
2 files changed, 23 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f6f9ed28..1e78c72e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -94,6 +94,27 @@ android:value="com.android.calendar.AllInOneActivity" /> </activity> + <activity android:name=".event.EditEventActivity" + android:theme="@style/CalendarTheme.WithActionBar"> + </activity> + + <activity-alias android:name="EditEventActivity" + android:targetActivity=".event.EditEventActivity" + android:exported="true"> + <intent-filter> + <action android:name="android.intent.action.EDIT" /> + <action android:name="android.intent.action.INSERT" /> + <category android:name="android.intent.category.DEFAULT" /> + <data android:mimeType="vnd.android.cursor.item/event" /> + </intent-filter> + <intent-filter> + <action android:name="android.intent.action.EDIT" /> + <action android:name="android.intent.action.INSERT" /> + <category android:name="android.intent.category.DEFAULT" /> + <data android:mimeType="vnd.android.cursor.dir/event" /> + </intent-filter> + </activity-alias> + <activity android:name="GoogleCalendarUriIntentFilter" android:label="@string/app_label" android:theme="@android:style/Theme.NoDisplay" android:configChanges="orientation|keyboardHidden"> diff --git a/src/com/android/calendar/widget/CalendarAppWidgetProvider.java b/src/com/android/calendar/widget/CalendarAppWidgetProvider.java index 2864d47a..3a69efd3 100644 --- a/src/com/android/calendar/widget/CalendarAppWidgetProvider.java +++ b/src/com/android/calendar/widget/CalendarAppWidgetProvider.java @@ -64,11 +64,11 @@ public class CalendarAppWidgetProvider extends AppWidgetProvider { performUpdate(context, appWidgetManager, appWidgetManager.getAppWidgetIds(getComponentName(context)), null /* no eventIds */); - } else if (action.equals(Intent.ACTION_PROVIDER_CHANGED) + } else if (action != null && (action.equals(Intent.ACTION_PROVIDER_CHANGED) || action.equals(Intent.ACTION_TIME_CHANGED) || action.equals(Intent.ACTION_TIMEZONE_CHANGED) || action.equals(Intent.ACTION_DATE_CHANGED) - || action.equals(Utils.getWidgetScheduledUpdateAction(context))) { + || action.equals(Utils.getWidgetScheduledUpdateAction(context)))) { Intent service = new Intent(context, CalendarAppWidgetService.class); context.startService(service); } else { |