summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-05-14 15:10:50 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-14 15:10:50 -0700
commit45167ac5cd04eb055b288707f863f33725bb11ff (patch)
tree8277176663c8cd5b31f3235f2cf1df9ef2e5e3d3 /src
parentb42f1a98f6908ef9bf02bbc0f23dabc6de91178e (diff)
parent73b36a86dbc119f06009efa83fb4d104cdb66a9a (diff)
downloadandroid_packages_apps_Trebuchet-45167ac5cd04eb055b288707f863f33725bb11ff.tar.gz
android_packages_apps_Trebuchet-45167ac5cd04eb055b288707f863f33725bb11ff.tar.bz2
android_packages_apps_Trebuchet-45167ac5cd04eb055b288707f863f33725bb11ff.zip
Merge "Fixing issue where qsb was not translated back into position when going home from an app. (Bug 6486197)" into jb-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/SearchDropTargetBar.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher2/SearchDropTargetBar.java b/src/com/android/launcher2/SearchDropTargetBar.java
index 5a1ba6904..153e3acc6 100644
--- a/src/com/android/launcher2/SearchDropTargetBar.java
+++ b/src/com/android/launcher2/SearchDropTargetBar.java
@@ -155,6 +155,7 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
} else {
mQSBSearchBar.setVisibility(View.VISIBLE);
mQSBSearchBar.setAlpha(1f);
+ mQSBSearchBar.setTranslationY(0);
}
mIsSearchBarHidden = false;
}
@@ -165,6 +166,7 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
} else {
mQSBSearchBar.setVisibility(View.INVISIBLE);
mQSBSearchBar.setAlpha(0f);
+ mQSBSearchBar.setTranslationY(0);
}
mIsSearchBarHidden = true;
}