diff options
| author | Mathew Inwood <mathewi@google.com> | 2011-07-04 01:50:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-04 01:50:26 -0700 |
| commit | d5dd2fbb3c9e822074fb70a4a7276a44373bb7c8 (patch) | |
| tree | 100fbc2ed8af3e06ea18e55541f89e046e5fdf98 /src | |
| parent | c9c56f4f717e84ca9f740d4bd3de16260c47625b (diff) | |
| parent | 68524cdd8c5c0fdd2a6ea92956eab033f0585dd9 (diff) | |
| download | android_packages_apps_Trebuchet-d5dd2fbb3c9e822074fb70a4a7276a44373bb7c8.tar.gz android_packages_apps_Trebuchet-d5dd2fbb3c9e822074fb70a4a7276a44373bb7c8.tar.bz2 android_packages_apps_Trebuchet-d5dd2fbb3c9e822074fb70a4a7276a44373bb7c8.zip | |
Merge "Remove workaround for wrong search icon in landscape."
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 0a57185bb..36ff2b2ef 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2748,22 +2748,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 { |