summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-06-18 14:43:56 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-18 14:43:56 -0700
commiteb04476def775427a4d216c9ce32e53da5ad4765 (patch)
treeaa51be60d87698511d570903783f350517de6dd9
parentd74389d9027a128da85be151670ee43e55feaba5 (diff)
parent324dbdd7a3d32b8c73d496111633cb3b843f4b16 (diff)
downloadandroid_packages_apps_Trebuchet-eb04476def775427a4d216c9ce32e53da5ad4765.tar.gz
android_packages_apps_Trebuchet-eb04476def775427a4d216c9ce32e53da5ad4765.tar.bz2
android_packages_apps_Trebuchet-eb04476def775427a4d216c9ce32e53da5ad4765.zip
Merge "Fix issue where "X" would appear over QSB bar in landscape mode" into jb-dev
-rw-r--r--src/com/android/launcher2/SearchDropTargetBar.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/SearchDropTargetBar.java b/src/com/android/launcher2/SearchDropTargetBar.java
index 77681a80c..a1d36cdfa 100644
--- a/src/com/android/launcher2/SearchDropTargetBar.java
+++ b/src/com/android/launcher2/SearchDropTargetBar.java
@@ -144,7 +144,7 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
if (mEnableDropDownDropTargets) {
mQSBSearchBar.setTranslationY(0);
} else {
- mDropTargetBar.setAlpha(1f);
+ mQSBSearchBar.setAlpha(1f);
}
}
mIsSearchBarHidden = false;
@@ -159,7 +159,7 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
if (mEnableDropDownDropTargets) {
mQSBSearchBar.setTranslationY(-mBarHeight);
} else {
- mDropTargetBar.setAlpha(0f);
+ mQSBSearchBar.setAlpha(0f);
}
}
mIsSearchBarHidden = true;