diff options
| author | James Lemieux <jplemieux@google.com> | 2016-04-05 18:40:40 -0700 |
|---|---|---|
| committer | James Lemieux <jplemieux@google.com> | 2016-04-06 14:05:28 -0700 |
| commit | 592c66b3eb497d24d1528fb2597059c6e4ec6620 (patch) | |
| tree | f14553bd763f81892b049f9f4fe76b84bb66a011 /AndroidManifest.xml | |
| parent | a5c107781dc8f8239bc980d19e1e31ed262e8829 (diff) | |
| download | android_packages_apps_DeskClock-592c66b3eb497d24d1528fb2597059c6e4ec6620.tar.gz android_packages_apps_DeskClock-592c66b3eb497d24d1528fb2597059c6e4ec6620.tar.bz2 android_packages_apps_DeskClock-592c66b3eb497d24d1528fb2597059c6e4ec6620.zip | |
Introduce world city widget
Bug: 27282291
Bug: 27693716
Bug: 24126517
This CL includes:
- full implementation of city widget
- event logging for creation/deletion of widgets
- tapping all widgets now opens the app in the prior state
(not the clock tab)
Change-Id: Ia43ec0ebf2f02aba6b7e277e5feca3e8afa91e64
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3c675c3a8..f5bd34fa2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -63,7 +63,6 @@ <activity android:name=".DeskClock" - android:icon="@mipmap/ic_launcher_alarmclock" android:label="@string/app_label" android:launchMode="singleTask" android:theme="@style/DeskClockTheme" @@ -78,7 +77,6 @@ <activity-alias android:name=".DockClock" android:enabled="false" - android:icon="@mipmap/ic_launcher_alarmclock" android:label="@string/app_label" android:launchMode="singleTask" android:targetActivity="DeskClock" @@ -113,6 +111,17 @@ </activity> <activity + android:name=".worldclock.WidgetCitySelectionActivity" + android:excludeFromRecents="true" + android:label="@string/cities_activity_title" + android:taskAffinity="" + android:theme="@style/CitiesTheme"> + <intent-filter> + <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/> + </intent-filter> + </activity> + + <activity android:name=".alarms.AlarmActivity" android:excludeFromRecents="true" android:showOnLockScreen="true" @@ -259,7 +268,6 @@ <receiver android:name="com.android.alarmclock.AnalogAppWidgetProvider" - android:icon="@mipmap/ic_launcher_alarmclock" android:label="@string/analog_gadget"> <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> @@ -275,7 +283,6 @@ <receiver android:name="com.android.alarmclock.DigitalAppWidgetProvider" - android:icon="@mipmap/ic_launcher_alarmclock" android:label="@string/digital_gadget"> <intent-filter> <action android:name="android.intent.action.SCREEN_ON" /> @@ -290,6 +297,22 @@ android:resource="@xml/digital_appwidget" /> </receiver> + <receiver + android:name="com.android.alarmclock.CityAppWidgetProvider" + android:label="@string/city_gadget"> + <intent-filter> + <action android:name="android.intent.action.TIME_SET" /> + <action android:name="android.intent.action.SCREEN_ON" /> + <action android:name="android.intent.action.DATE_CHANGED" /> + <action android:name="android.intent.action.LOCALE_CHANGED" /> + <action android:name="android.intent.action.TIMEZONE_CHANGED" /> + <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> + </intent-filter> + <meta-data + android:name="android.appwidget.provider" + android:resource="@xml/city_appwidget" /> + </receiver> + <!-- Dream (screensaver) implementation --> <service android:name=".Screensaver" |