summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authornebkat <nebkat@teamhacksung.org>2012-01-15 19:21:11 +0300
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-01-15 19:21:11 +0300
commit7b933556c5edd6a719b58c748e390d28eeb019fe (patch)
tree3be5dea5422c1e68c33311a97e02bec7e2773225 /src
parenta983c4ffc5b0d2b5b9f6aced0993863e125a7c0f (diff)
parentb16eb6fcb2a8153553e84c8f35e9e738cc4c332b (diff)
downloadandroid_packages_apps_Trebuchet-7b933556c5edd6a719b58c748e390d28eeb019fe.tar.gz
android_packages_apps_Trebuchet-7b933556c5edd6a719b58c748e390d28eeb019fe.tar.bz2
android_packages_apps_Trebuchet-7b933556c5edd6a719b58c748e390d28eeb019fe.zip
Merge "SearchDropTargetBar: Fix search bar hiding on tablets" into ics
Diffstat (limited to 'src')
-rw-r--r--src/com/cyanogenmod/trebuchet/Launcher.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java
index 3e758d414..c46f2e869 100644
--- a/src/com/cyanogenmod/trebuchet/Launcher.java
+++ b/src/com/cyanogenmod/trebuchet/Launcher.java
@@ -795,13 +795,15 @@ public final class Launcher extends Activity
// Get the search/delete bar
mSearchDropTargetBar = (SearchDropTargetBar) mDragLayer.findViewById(R.id.qsb_bar);
+ final View qsbDivider = findViewById(R.id.qsb_divider);
+ final View dockDivider = findViewById(R.id.dock_divider);
// Hide the search divider if we are hiding search bar
- if (!mShowSearchBar && getCurrentOrientation() == Configuration.ORIENTATION_LANDSCAPE) {
- ((View) findViewById(R.id.qsb_divider)).setVisibility(View.GONE);
+ if (!mShowSearchBar && qsbDivider != null) {
+ qsbDivider.setVisibility(View.GONE);
}
- if (!mShowDockDivider) {
- ((View) findViewById(R.id.dock_divider)).setVisibility(View.GONE);
+ if (!mShowDockDivider && dockDivider != null) {
+ dockDivider.setVisibility(View.GONE);
}
// Setup AppsCustomize