diff options
| author | James Lemieux <jplemieux@google.com> | 2015-07-21 18:42:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-21 18:42:45 +0000 |
| commit | e648614f8130960f83fe03ec022f3a8c46942b30 (patch) | |
| tree | a012cc3cd2dfca8c5846699b4cabdecbaa351d03 | |
| parent | 2ec1aa5d07654695981504d1321c55d358862d75 (diff) | |
| parent | 2417c25ee5d27e0878cbe9d73f1fdbff43a20c1c (diff) | |
| download | android_packages_apps_DeskClock-e648614f8130960f83fe03ec022f3a8c46942b30.tar.gz android_packages_apps_DeskClock-e648614f8130960f83fe03ec022f3a8c46942b30.tar.bz2 android_packages_apps_DeskClock-e648614f8130960f83fe03ec022f3a8c46942b30.zip | |
am 2417c25e: am 02bc9952: am 76846b72: Support voice category on all public intents
* commit '2417c25ee5d27e0878cbe9d73f1fdbff43a20c1c':
Support voice category on all public intents
| -rw-r--r-- | AndroidManifest.xml | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7768c2b35..a66b5c50a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -130,22 +130,27 @@ <intent-filter> <action android:name="android.intent.action.SET_ALARM" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> <intent-filter> <action android:name="android.intent.action.DISMISS_ALARM" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> <intent-filter> <action android:name="android.intent.action.SNOOZE_ALARM" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> <intent-filter> <action android:name="android.intent.action.SHOW_ALARMS" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> <intent-filter> <action android:name="android.intent.action.SET_TIMER" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> </activity> @@ -155,62 +160,75 @@ </activity-alias> <activity android:name=".HandleDeskClockApiCalls" + android:theme="@android:style/Theme.NoDisplay" android:excludeFromRecents="true" android:launchMode="singleTask" - android:taskAffinity="" - android:theme="@android:style/Theme.NoDisplay" - android:permission="com.android.alarm.permission.SET_ALARM"> + android:permission="com.android.alarm.permission.SET_ALARM" + android:taskAffinity=""> <intent-filter> <action android:name="com.android.deskclock.action.SHOW_CLOCK" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> <intent-filter> <action android:name="com.android.deskclock.action.ADD_CLOCK" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> <intent-filter> <action android:name="com.android.deskclock.action.DELETE_CLOCK" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> <intent-filter> <action android:name="com.android.deskclock.action.START_TIMER" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> <intent-filter> <action android:name="com.android.deskclock.action.RESET_TIMER" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> <intent-filter> <action android:name="com.android.deskclock.action.STOP_TIMER" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> <intent-filter> <action android:name="com.android.deskclock.action.SHOW_TIMERS" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> <intent-filter> <action android:name="com.android.deskclock.action.DELETE_TIMER" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> <intent-filter> <action android:name="com.android.deskclock.action.SHOW_STOPWATCH" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> <intent-filter> <action android:name="com.android.deskclock.action.START_STOPWATCH" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> <intent-filter> <action android:name="com.android.deskclock.action.STOP_STOPWATCH" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> <intent-filter> <action android:name="com.android.deskclock.action.LAP_STOPWATCH" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> <intent-filter> <action android:name="com.android.deskclock.action.RESET_STOPWATCH" /> <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE" /> </intent-filter> </activity> |