diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2015-04-09 17:54:00 -0700 |
|---|---|---|
| committer | Raj Yengisetty <rajesh@cyngn.com> | 2015-05-12 13:37:38 -0700 |
| commit | 7f0a6204f692a1eda48e47a74e0481d6d7bc2191 (patch) | |
| tree | a143e80d47a29026f39a35eb06e4dce93a174460 /src/com/android/launcher3/Workspace.java | |
| parent | e301067845dd42ad778f4271e30e244bad457086 (diff) | |
| download | android_packages_apps_Trebuchet-7f0a6204f692a1eda48e47a74e0481d6d7bc2191.tar.gz android_packages_apps_Trebuchet-7f0a6204f692a1eda48e47a74e0481d6d7bc2191.tar.bz2 android_packages_apps_Trebuchet-7f0a6204f692a1eda48e47a74e0481d6d7bc2191.zip | |
Trebuchet: new folder UI v1
This change adds a number of new UI components and animations for
folders.
Designer: Hayden Schoen
Change-Id: I255cd4664432d84aebecf7e16ace5d9948573e27
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index a0b99e51e..298589650 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2545,7 +2545,9 @@ public class Workspace extends SmoothPagedView // Animation animation = AnimationUtils.loadAnimation(mLauncher, R.anim.drop_down); // overviewPanel.startAnimation(animation); anim.play(hotseatAlpha); - if (mShowSearchBar) anim.play(searchBarAlpha); + if (mShowSearchBar && !mLauncher.getDragController().isDragging()) { + anim.play(searchBarAlpha); + } anim.play(pageIndicatorAlpha); anim.setStartDelay(delay); } else { @@ -2558,7 +2560,7 @@ public class Workspace extends SmoothPagedView AlphaUpdateListener.updateVisibility(pageIndicator); } - if (mShowSearchBar) { + if (mShowSearchBar && !mLauncher.getDragController().isDragging()) { searchBar.setAlpha(finalSearchBarAlpha); AlphaUpdateListener.updateVisibility(searchBar); } |