diff options
author | Jim Miller <jaggies@google.com> | 2012-06-18 19:23:39 -0700 |
---|---|---|
committer | Jim Miller <jaggies@google.com> | 2012-06-19 15:00:13 -0700 |
commit | 45308b1b3b1582d048845df2ee5301241e52a5cf (patch) | |
tree | 42befbc7aa70ffd9eea09fe3ba29681b84b437a4 /tests/Assistant/AndroidManifest.xml | |
parent | c2585467107995f3130872eb7b721f3dbbcdf505 (diff) | |
download | frameworks_base-45308b1b3b1582d048845df2ee5301241e52a5cf.zip frameworks_base-45308b1b3b1582d048845df2ee5301241e52a5cf.tar.gz frameworks_base-45308b1b3b1582d048845df2ee5301241e52a5cf.tar.bz2 |
Fix 6667238: allow market apps to support ACTION_ASSIST
This change allows market apps and 3rd parties to supply an activity
that responds to ACTION_ASSIST (e.g. market apps).
It also adds a test app to respond to the ASSIST intent and force
the intent disambiguation dialog to appear.
Change-Id: I5a78863c6a9546d18c66275187d178f6a1c9ee17
Diffstat (limited to 'tests/Assistant/AndroidManifest.xml')
-rw-r--r-- | tests/Assistant/AndroidManifest.xml | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/tests/Assistant/AndroidManifest.xml b/tests/Assistant/AndroidManifest.xml new file mode 100644 index 0000000..b5d4d51 --- /dev/null +++ b/tests/Assistant/AndroidManifest.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.google.android.test.assistant"> + + <application android:label="@string/activity_title"> + + <activity android:name=".AssistActivity" + android:theme="@android:style/Theme.NoTitleBar"> + + <!-- Handle assist intent --> + <intent-filter> + <action android:name="android.intent.action.ASSIST" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + + <!-- Provide icon for search --> + <meta-data android:name="com.android.systemui.action_assist_icon" + android:resource="@drawable/ic_action_assist" /> + + </activity> + + </application> + +</manifest> |