Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Jim Miller
committed
Jun 19, 2012
1 parent
c258546
commit 45308b1
Showing
17 changed files
with
254 additions
and
116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
LOCAL_PATH:= $(call my-dir) | ||
include $(CLEAR_VARS) | ||
|
||
LOCAL_SRC_FILES := $(call all-subdir-java-files) | ||
|
||
LOCAL_PACKAGE_NAME := Assistant | ||
|
||
LOCAL_MODULE_TAGS := tests | ||
LOCAL_CERTIFICATE := platform | ||
|
||
include $(BUILD_PACKAGE) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<!-- Copyright (C) 2012 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. | ||
--> | ||
<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
|
||
<item | ||
android:state_enabled="true" | ||
android:state_active="false" | ||
android:state_focused="false" | ||
android:drawable="@drawable/ic_action_assist_normal" /> | ||
|
||
<item | ||
android:state_enabled="true" | ||
android:state_active="true" | ||
android:state_focused="false" | ||
android:drawable="@drawable/ic_action_assist_activated" /> | ||
|
||
<item | ||
android:state_enabled="true" | ||
android:state_active="false" | ||
android:state_focused="true" | ||
android:drawable="@drawable/ic_action_assist_activated" /> | ||
|
||
</selector> |
Oops, something went wrong.