diff options
| author | Mathew Inwood <mathewi@google.com> | 2011-07-01 13:59:38 +0100 |
|---|---|---|
| committer | Mathew Inwood <mathewi@google.com> | 2011-07-01 14:02:44 +0100 |
| commit | 68524cdd8c5c0fdd2a6ea92956eab033f0585dd9 (patch) | |
| tree | e1e989580b62afea69ae5792fdc2694daaf1fb53 /src | |
| parent | 04dc2bc6139ff414e49fc423d28edbd5801cdc03 (diff) | |
| download | android_packages_apps_Trebuchet-68524cdd8c5c0fdd2a6ea92956eab033f0585dd9.tar.gz android_packages_apps_Trebuchet-68524cdd8c5c0fdd2a6ea92956eab033f0585dd9.tar.bz2 android_packages_apps_Trebuchet-68524cdd8c5c0fdd2a6ea92956eab033f0585dd9.zip | |
Remove workaround for wrong search icon in landscape.
QSB now has a different asset so this is not needed.
Change-Id: If695ed1b76d69dc00a26b943c51823bc66e276ee
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 54b7b9c2c..6157401a3 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2732,22 +2732,8 @@ public final class Launcher extends Activity (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); - } + sGlobalSearchIcon = updateButtonWithIconFromExternalActivity( + R.id.search_button, activityName, R.drawable.ic_generic_search); searchButton.setVisibility(View.VISIBLE); searchDivider.setVisibility(View.VISIBLE); } else { |