diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-07-11 17:30:03 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-07-13 12:37:08 -0700 |
commit | 6178f13e2d1f0c1a89cea74538b51993ef3439e3 (patch) | |
tree | ea28a996bccd6f022001ab5b1aa5fcedf2de2fbc /src/com/android/launcher3/PinchAnimationManager.java | |
parent | ba162aa7d2a49c09c00ff3184ffda3bea0e55509 (diff) | |
download | android_packages_apps_Trebuchet-6178f13e2d1f0c1a89cea74538b51993ef3439e3.tar.gz android_packages_apps_Trebuchet-6178f13e2d1f0c1a89cea74538b51993ef3439e3.tar.bz2 android_packages_apps_Trebuchet-6178f13e2d1f0c1a89cea74538b51993ef3439e3.zip |
Moving the QSB out of the cell layout to the Drag layer
This allows better edge matching for the QSB. The QSB position
is kept synchronized with the page scroll and all-apps transition.
But its not visible in spring loaded and overview mode
Change-Id: I4e6723607ea966ee672273a9ca67c792fd6b5661
Diffstat (limited to 'src/com/android/launcher3/PinchAnimationManager.java')
-rw-r--r-- | src/com/android/launcher3/PinchAnimationManager.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/com/android/launcher3/PinchAnimationManager.java b/src/com/android/launcher3/PinchAnimationManager.java index c1c25195b..38079454d 100644 --- a/src/com/android/launcher3/PinchAnimationManager.java +++ b/src/com/android/launcher3/PinchAnimationManager.java @@ -51,8 +51,8 @@ public class PinchAnimationManager { private static final int THRESHOLD_ANIM_DURATION = 150; private static final LinearInterpolator INTERPOLATOR = new LinearInterpolator(); - private static final int INDEX_PAGE_INDICATOR = 0; - private static final int INDEX_HOTSEAT = 1; + private static final int INDEX_HOTSEAT = 0; + private static final int INDEX_QSB = 1; private static final int INDEX_OVERVIEW_PANEL_BUTTONS = 2; private static final int INDEX_SCRIM = 3; @@ -189,11 +189,10 @@ public class PinchAnimationManager { } private void animateHotseatAndPageIndicator(boolean show) { - animateShowHideView(INDEX_HOTSEAT, mLauncher.getHotseat(), show); - if (mWorkspace.getPageIndicator() != null) { - // There aren't page indicators in landscape mode on phones, hence the null check. - animateShowHideView(INDEX_PAGE_INDICATOR, mWorkspace.getPageIndicator(), show); - } + startAnimator(INDEX_HOTSEAT, + mWorkspace.createHotseatAlphaAnimator(show ? 1 : 0), THRESHOLD_ANIM_DURATION); + startAnimator(INDEX_QSB, mWorkspace.mQsbAlphaController.animateAlphaAtIndex( + show ? 1 : 0, Workspace.QSB_ALPHA_INDEX_STATE_CHANGE), THRESHOLD_ANIM_DURATION); } private void animateOverviewPanelButtons(boolean show) { |