diff options
| author | Winson Chung <winsonc@google.com> | 2011-08-24 13:47:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-24 13:47:55 -0700 |
| commit | cf0172d56c737c741f9cd62cb24020e9cd0de4a5 (patch) | |
| tree | d0948ba98231fa0d2b0f4fb049fc480dd1f5402c /src/com/android/launcher2 | |
| parent | efad83059881d20ff97ec277581d54492bae6213 (diff) | |
| parent | cbf7c4d50ce2609518640c3f590f6df435edabae (diff) | |
| download | android_packages_apps_Trebuchet-cf0172d56c737c741f9cd62cb24020e9cd0de4a5.tar.gz android_packages_apps_Trebuchet-cf0172d56c737c741f9cd62cb24020e9cd0de4a5.tar.bz2 android_packages_apps_Trebuchet-cf0172d56c737c741f9cd62cb24020e9cd0de4a5.zip | |
Merge "Hiding search bar buttons when qsb is disabled. (5187969, 5201453)"
Diffstat (limited to 'src/com/android/launcher2')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher2/LauncherApplication.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 262ed9326..22a34e6c7 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2490,6 +2490,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); @@ -2500,8 +2501,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(); } |