diff options
author | Winson Chung <winsonc@google.com> | 2011-06-06 14:27:16 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2011-06-13 11:49:32 -0700 |
commit | f0ea4d3378be7b962c8e0bce2392df5e82491fb8 (patch) | |
tree | 72300454a7751c7d1b239c5264a73233736fc8a0 /src/com/android/launcher2/SearchDropTargetBar.java | |
parent | bf5a5c894d8af7f3b3001ebbc596fd83a0a73c7e (diff) | |
download | android_packages_apps_Trebuchet-f0ea4d3378be7b962c8e0bce2392df5e82491fb8.tar.gz android_packages_apps_Trebuchet-f0ea4d3378be7b962c8e0bce2392df5e82491fb8.tar.bz2 android_packages_apps_Trebuchet-f0ea4d3378be7b962c8e0bce2392df5e82491fb8.zip |
Replacing AllApps/Customize in tablet UI with Apps/Customize.
Change-Id: I11a296b25472e4bf298a468865b0dff29f500aaa
Diffstat (limited to 'src/com/android/launcher2/SearchDropTargetBar.java')
-rw-r--r-- | src/com/android/launcher2/SearchDropTargetBar.java | 41 |
1 files changed, 38 insertions, 3 deletions
diff --git a/src/com/android/launcher2/SearchDropTargetBar.java b/src/com/android/launcher2/SearchDropTargetBar.java index 7a208b761..5ab28ea4a 100644 --- a/src/com/android/launcher2/SearchDropTargetBar.java +++ b/src/com/android/launcher2/SearchDropTargetBar.java @@ -33,8 +33,9 @@ import com.android.launcher.R; public class SearchDropTargetBar extends FrameLayout implements DragController.DragListener { private static final int sTransitionInDuration = 275; - private static final int sTransitionOutDuration = 200; + private static final int sTransitionOutDuration = 100; + private boolean mIsSearchBarHidden; private View mQSBSearchBar; private View mDropTargetBar; private IconDropTarget mInfoDropTarget; @@ -70,19 +71,53 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D } /* + * Shows and hides the search bar. + */ + public void showSearchBar(boolean animated) { + if (animated) { + mQSBSearchBar.animate().alpha(1f).setDuration(sTransitionInDuration); + } else { + mQSBSearchBar.setAlpha(1f); + } + mIsSearchBarHidden = false; + } + public void hideSearchBar(boolean animated) { + if (animated) { + mQSBSearchBar.animate().alpha(0f).setDuration(sTransitionOutDuration); + } else { + mQSBSearchBar.setAlpha(0f); + } + mIsSearchBarHidden = true; + } + + /* + * Gets various transition durations. + */ + public int getTransitionInDuration() { + return sTransitionInDuration; + } + public int getTransitionOutDuration() { + return sTransitionOutDuration; + } + + /* * DragController.DragListener implementation */ @Override public void onDragStart(DragSource source, Object info, int dragAction) { // Animate out the QSB search bar, and animate in the drop target bar - mQSBSearchBar.animate().alpha(0f).setDuration(sTransitionOutDuration); mDropTargetBar.animate().alpha(1f).setDuration(sTransitionInDuration); + if (!mIsSearchBarHidden) { + mQSBSearchBar.animate().alpha(0f).setDuration(sTransitionOutDuration); + } } @Override public void onDragEnd() { // Restore the QSB search bar, and animate out the drop target bar mDropTargetBar.animate().alpha(0f).setDuration(sTransitionOutDuration); - mQSBSearchBar.animate().alpha(1f).setDuration(sTransitionInDuration); + if (!mIsSearchBarHidden) { + mQSBSearchBar.animate().alpha(1f).setDuration(sTransitionInDuration); + } } } |