diff options
| author | Tony Wickham <twickham@google.com> | 2018-04-26 00:44:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-26 00:44:45 +0000 |
| commit | 7a0e965c4f5bd0029248cd2c726fc84d19f31c15 (patch) | |
| tree | a76253aa89f024cddd615ecfd6e2552407fad947 | |
| parent | 87249707a50cad1566524c93e2537fb92ec40ead (diff) | |
| parent | 4923c0557ffa5503741e1a5a0fa3accbbedc3dd1 (diff) | |
| download | packages_apps_Trebuchet-7a0e965c4f5bd0029248cd2c726fc84d19f31c15.tar.gz packages_apps_Trebuchet-7a0e965c4f5bd0029248cd2c726fc84d19f31c15.tar.bz2 packages_apps_Trebuchet-7a0e965c4f5bd0029248cd2c726fc84d19f31c15.zip | |
Merge "Don't animate hotseat when launching if swipe up disabled" into ub-launcher3-edmonton
| -rw-r--r-- | quickstep/src/com/android/quickstep/views/LauncherRecentsView.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java index d69beb6a5..90749eb95 100644 --- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java +++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java @@ -35,6 +35,7 @@ import android.view.ViewDebug; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; +import com.android.quickstep.OverviewInteractionState; import com.android.quickstep.util.LayoutUtils; /** @@ -118,6 +119,12 @@ public class LauncherRecentsView extends RecentsView<Launcher> { public AnimatorSet createAdjacentPageAnimForTaskLaunch(TaskView tv) { AnimatorSet anim = super.createAdjacentPageAnimForTaskLaunch(tv); + if (!OverviewInteractionState.getInstance(mActivity).isSwipeUpGestureEnabled()) { + // Hotseat doesn't move when opening recents with the button, + // so don't animate it here either. + return anim; + } + float allAppsProgressOffscreen = ALL_APPS_PROGRESS_OFF_SCREEN; LauncherState state = mActivity.getStateManager().getState(); if ((state.getVisibleElements(mActivity) & ALL_APPS_HEADER_EXTRA) != 0) { |