diff options
author | Winson Chung <winsonc@google.com> | 2011-05-26 15:18:21 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-26 15:18:21 -0700 |
commit | 5542d4c929f99e248f56a2721d705c2992752fe0 (patch) | |
tree | 95e65674b4a8f81d06fc54f005fa0cf6e22142b9 /src/com | |
parent | 4d2e54c517f2e9cf451536cf9c126cf9839d49bb (diff) | |
parent | 1cad91e625386885a4b5f82a7fa3f05c5e575750 (diff) | |
download | android_packages_apps_Trebuchet-5542d4c929f99e248f56a2721d705c2992752fe0.tar.gz android_packages_apps_Trebuchet-5542d4c929f99e248f56a2721d705c2992752fe0.tar.bz2 android_packages_apps_Trebuchet-5542d4c929f99e248f56a2721d705c2992752fe0.zip |
Merge "Adding QSB"
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 64 |
1 files changed, 37 insertions, 27 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 2a16e9978..631042e02 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -3157,22 +3157,34 @@ public final class Launcher extends Activity } private void updateGlobalSearchIcon() { - if (LauncherApplication.isScreenLarge()) { - final View searchButton = findViewById(R.id.search_button); - final View searchDivider = findViewById(R.id.search_divider); + final ImageView searchButton = (ImageView) findViewById(R.id.search_button); + final View searchDivider = findViewById(R.id.search_divider); - final SearchManager searchManager = - (SearchManager) getSystemService(Context.SEARCH_SERVICE); - ComponentName activityName = searchManager.getGlobalSearchActivity(); - if (activityName != null) { + final SearchManager searchManager = + (SearchManager) getSystemService(Context.SEARCH_SERVICE); + ComponentName activityName = searchManager.getGlobalSearchActivity(); + if (activityName != null) { + // In landscape mode on the Phone UI, we only have enough space to show the magnifying + // glass icon + boolean iconLoaded = false; + if (!LauncherApplication.isScreenLarge()) { + // TODO-APPS_CUSTOMIZE: Remove when the QSB fixes itself? + int orientation = getResources().getConfiguration().orientation; + if (orientation == Configuration.ORIENTATION_LANDSCAPE) { + searchButton.setImageResource(R.drawable.ic_generic_search); + iconLoaded = true; + sGlobalSearchIcon = null; + } + } + if (!iconLoaded) { sGlobalSearchIcon = updateButtonWithIconFromExternalActivity( R.id.search_button, activityName, R.drawable.ic_generic_search); - searchButton.setVisibility(View.VISIBLE); - searchDivider.setVisibility(View.VISIBLE); - } else { - searchButton.setVisibility(View.GONE); - searchDivider.setVisibility(View.GONE); } + searchButton.setVisibility(View.VISIBLE); + searchDivider.setVisibility(View.VISIBLE); + } else { + searchButton.setVisibility(View.GONE); + searchDivider.setVisibility(View.GONE); } } @@ -3181,21 +3193,19 @@ public final class Launcher extends Activity } private void updateVoiceSearchIcon() { - if (LauncherApplication.isScreenLarge()) { - final View searchDivider = findViewById(R.id.search_divider); - final View voiceButton = findViewById(R.id.voice_button); - - Intent intent = new Intent(RecognizerIntent.ACTION_WEB_SEARCH); - ComponentName activityName = intent.resolveActivity(getPackageManager()); - if (activityName != null) { - sVoiceSearchIcon = updateButtonWithIconFromExternalActivity( - R.id.voice_button, activityName, R.drawable.ic_voice_search); - searchDivider.setVisibility(View.VISIBLE); - voiceButton.setVisibility(View.VISIBLE); - } else { - searchDivider.setVisibility(View.GONE); - voiceButton.setVisibility(View.GONE); - } + final View searchDivider = findViewById(R.id.search_divider); + final View voiceButton = findViewById(R.id.voice_button); + + Intent intent = new Intent(RecognizerIntent.ACTION_WEB_SEARCH); + ComponentName activityName = intent.resolveActivity(getPackageManager()); + if (activityName != null) { + sVoiceSearchIcon = updateButtonWithIconFromExternalActivity( + R.id.voice_button, activityName, R.drawable.ic_voice_search); + searchDivider.setVisibility(View.VISIBLE); + voiceButton.setVisibility(View.VISIBLE); + } else { + searchDivider.setVisibility(View.GONE); + voiceButton.setVisibility(View.GONE); } } |