commit 542644020e7a1bbe1ad5599bd07d83481a6b9c8e
author Winson Chung <winsonc@google.com> Tue May 15 11:35:12 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 15 11:35:12 2012 -0700
tree 8277176663c8cd5b31f3235f2cf1df9ef2e5e3d3
parent 6428c881dfd4d07a93a6802d02bd031176334fe3
parent 45167ac5cd04eb055b288707f863f33725bb11ff

am 45167ac5: Merge "Fixing issue where qsb was not translated back into position when going home from an app. (Bug 6486197)" into jb-dev

* commit '45167ac5cd04eb055b288707f863f33725bb11ff':
  Fixing issue where qsb was not translated back into position when going home from an app. (Bug 6486197)

src/com/android/launcher2/SearchDropTargetBar.java

diff --git a/src/com/android/launcher2/SearchDropTargetBar.java b/src/com/android/launcher2/SearchDropTargetBar.java
index 5a1ba69..153e3ac 100644
--- a/src/com/android/launcher2/SearchDropTargetBar.java
+++ b/src/com/android/launcher2/SearchDropTargetBar.java
@@ -155,6 +155,7 @@
         } else {
             mQSBSearchBar.setVisibility(View.VISIBLE);
             mQSBSearchBar.setAlpha(1f);
+            mQSBSearchBar.setTranslationY(0);
         }
         mIsSearchBarHidden = false;
     }
@@ -165,6 +166,7 @@
         } else {
             mQSBSearchBar.setVisibility(View.INVISIBLE);
             mQSBSearchBar.setAlpha(0f);
+            mQSBSearchBar.setTranslationY(0);
         }
         mIsSearchBarHidden = true;
     }