summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-06-18 21:46:15 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-18 21:46:15 (GMT)
commit3d8bdd63056435296a4d98eb4f2567c6f40d16fc (patch)
treeaa51be60d87698511d570903783f350517de6dd9
parent2561ee8453dc41a9d65f7890ea227416d7e8948c (diff)
parenteb04476def775427a4d216c9ce32e53da5ad4765 (diff)
downloadandroid_packages_apps_Trebuchet-3d8bdd63056435296a4d98eb4f2567c6f40d16fc.zip
android_packages_apps_Trebuchet-3d8bdd63056435296a4d98eb4f2567c6f40d16fc.tar.gz
android_packages_apps_Trebuchet-3d8bdd63056435296a4d98eb4f2567c6f40d16fc.tar.bz2
am eb04476d: Merge "Fix issue where "X" would appear over QSB bar in landscape mode" into jb-dev
* commit 'eb04476def775427a4d216c9ce32e53da5ad4765': Fix issue where "X" would appear over QSB bar in landscape mode
-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 77681a8..a1d36cd 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;