summaryrefslogtreecommitdiffstats
path: root/tests/Assistant/src/com
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2012-06-18 19:23:39 -0700
committerJim Miller <jaggies@google.com>2012-06-19 15:00:13 -0700
commit45308b1b3b1582d048845df2ee5301241e52a5cf (patch)
tree42befbc7aa70ffd9eea09fe3ba29681b84b437a4 /tests/Assistant/src/com
parentc2585467107995f3130872eb7b721f3dbbcdf505 (diff)
downloadframeworks_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/src/com')
-rw-r--r--tests/Assistant/src/com/google/android/test/assistant/AssistActivity.java31
1 files changed, 31 insertions, 0 deletions
diff --git a/tests/Assistant/src/com/google/android/test/assistant/AssistActivity.java b/tests/Assistant/src/com/google/android/test/assistant/AssistActivity.java
new file mode 100644
index 0000000..51894a1
--- /dev/null
+++ b/tests/Assistant/src/com/google/android/test/assistant/AssistActivity.java
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+package com.google.android.test.assistant;
+
+import android.app.Activity;
+import android.os.Bundle;
+import com.google.android.test.assistant.R;
+
+public class AssistActivity extends Activity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.assist_intent_activity);
+ }
+
+}