commit 9827c9da923d193fcac285ad70cc8d68835ee6f0
author Mathew Inwood <mathewi@google.com> Fri Jul 23 10:34:16 2010 +0100
committer Mathew Inwood <mathewi@google.com> Fri Jul 23 11:05:28 2010 +0100
tree 4c91dd81123fa2588a9c31e3e8f8b2f90d0f8be4
parent 2dfefcf67c7c28c8337725ef30d623a47638b374

Fix interaction with voice search hints, so that disabling works properly.

Bug: 2862006

Change-Id: I2a7806785ee3b135c038b315d12ab32fda350777

src/com/android/quicksearchbox/SearchWidgetProvider.java

diff --git a/src/com/android/quicksearchbox/SearchWidgetProvider.java b/src/com/android/quicksearchbox/SearchWidgetProvider.java
index 66e45ea..8b77c4d 100644
--- a/src/com/android/quicksearchbox/SearchWidgetProvider.java
+++ b/src/com/android/quicksearchbox/SearchWidgetProvider.java
@@ -77,7 +77,8 @@
             "com.android.quicksearchbox.action.CONSIDER_VOICE_SEARCH_HINT";
 
     /**
-     * Broadcast intent action for displaying voice search hints immediately.
+     * Broadcast intent action for displaying voice search hints immediately, and resetting the
+     * 'first seen' voice search timestamp, so we continue to show them for a while.
      */
     private static final String ACTION_SHOW_VOICE_SEARCH_HINT_NOW =
             "com.android.quicksearchbox.action.SHOW_VOICE_SEARCH_HINT_NOW";
@@ -85,6 +86,9 @@
     private static final String ACTION_RESET_VOICE_SEARCH_HINT_FIRST_SEEN =
             "com.android.quicksearchbox.action.debugonly.RESET_HINT_FIRST_SEEN_TIME";
 
+    private static final String ACTION_SHOW_HINT_TEMPORARILY =
+            "com.android.quicksearchbox.action.debugonly.SHOW_HINT_TEMPORARILY";
+
     /**
      * Preference key used for storing the index of the next voice search hint to show.
      */
@@ -123,8 +127,13 @@
             hideVoiceSearchHint(context);
         } else if (ACTION_SHOW_VOICE_SEARCH_HINT_NOW.equals(action)) {
             showVoiceSearchHintNow(context);
+            resetVoiceSearchHintFirstSeenTime(context);
+        } else if (ACTION_SHOW_HINT_TEMPORARILY.equals(action)) {
+            showVoiceSearchHintNow(context);
         } else if (ACTION_RESET_VOICE_SEARCH_HINT_FIRST_SEEN.equals(action)) {
             resetVoiceSearchHintFirstSeenTime(context);
+        } else {
+            if (DBG) Log.d(TAG, "Unhandled intent action=" + action);
         }
     }
 
@@ -427,6 +436,7 @@
      */
     private static void getHintsFromVoiceSearch(Context context) {
         Intent intent = new Intent(RecognizerIntent.ACTION_GET_LANGUAGE_DETAILS);
+        intent.putExtra(Recognition.EXTRA_HINT_CONTEXT, Recognition.HINT_CONTEXT_LAUNCHER);
         if (DBG) Log.d(TAG, "Broadcasting " + intent);
         context.sendOrderedBroadcast(intent, null,
                 new HintReceiver(), null, Activity.RESULT_OK, null, null);
@@ -435,6 +445,7 @@
     private static class HintReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
+            if (DBG) Log.d(TAG, "onReceive(" + intent.toUri(0) + ")");
             if (getResultCode() != Activity.RESULT_OK) {
                 return;
             }