summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Launcher.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-08-24 13:47:55 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-24 13:47:55 -0700
commitcf0172d56c737c741f9cd62cb24020e9cd0de4a5 (patch)
treed0948ba98231fa0d2b0f4fb049fc480dd1f5402c /src/com/android/launcher2/Launcher.java
parentefad83059881d20ff97ec277581d54492bae6213 (diff)
parentcbf7c4d50ce2609518640c3f590f6df435edabae (diff)
downloadpackages_apps_trebuchet-cf0172d56c737c741f9cd62cb24020e9cd0de4a5.zip
packages_apps_trebuchet-cf0172d56c737c741f9cd62cb24020e9cd0de4a5.tar.gz
packages_apps_trebuchet-cf0172d56c737c741f9cd62cb24020e9cd0de4a5.tar.bz2
Merge "Hiding search bar buttons when qsb is disabled. (5187969, 5201453)"
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r--src/com/android/launcher2/Launcher.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 262ed93..22a34e6 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);
}
}