From cbf7c4d50ce2609518640c3f590f6df435edabae Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Tue, 23 Aug 2011 11:58:54 -0700 Subject: Hiding search bar buttons when qsb is disabled. (5187969, 5201453) Change-Id: I23cbfac5c1a8f96eb8158fd30a1fb335b044d49c --- src/com/android/launcher2/Launcher.java | 3 +++ src/com/android/launcher2/LauncherApplication.java | 3 +++ src/com/android/launcher2/LauncherModel.java | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 44dbc1552..b42a6f7f7 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2486,6 +2486,7 @@ public final class Launcher extends Activity private void updateGlobalSearchIcon() { final ImageView searchButton = (ImageView) findViewById(R.id.search_button); final View searchDivider = findViewById(R.id.search_divider); + final View voiceButton = findViewById(R.id.voice_button); final SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE); @@ -2496,8 +2497,10 @@ public final class Launcher extends Activity searchButton.setVisibility(View.VISIBLE); if (searchDivider != null) searchDivider.setVisibility(View.VISIBLE); } else { + // We disable both search and voice search when there is no global search provider searchButton.setVisibility(View.GONE); if (searchDivider != null) searchDivider.setVisibility(View.GONE); + voiceButton.setVisibility(View.GONE); } } diff --git a/src/com/android/launcher2/LauncherApplication.java b/src/com/android/launcher2/LauncherApplication.java index 9b2458758..ba028efea 100644 --- a/src/com/android/launcher2/LauncherApplication.java +++ b/src/com/android/launcher2/LauncherApplication.java @@ -62,6 +62,9 @@ public class LauncherApplication extends Application { filter = new IntentFilter(); filter.addAction(SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED); registerReceiver(mModel, filter); + filter = new IntentFilter(); + filter.addAction(SearchManager.INTENT_ACTION_SEARCHABLES_CHANGED); + registerReceiver(mModel, filter); // Register for changes to the favorites ContentResolver resolver = getContentResolver(); diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index f14140c16..21c34bb92 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -585,7 +585,8 @@ public class LauncherModel extends BroadcastReceiver { mAllAppsLoaded = false; mWorkspaceLoaded = false; startLoaderFromBackground(); - } else if (SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED.equals(action)) { + } else if (SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED.equals(action) || + SearchManager.INTENT_ACTION_SEARCHABLES_CHANGED.equals(action)) { Callbacks callbacks = mCallbacks.get(); callbacks.bindSearchablesChanged(); } -- cgit v1.2.3