summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/PinchAnimationManager.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2017-06-06 16:43:59 -0700
committerSunny Goyal <sunnygoyal@google.com>2017-06-06 16:48:25 -0700
commit966d901af0fd319aa2b62d6abccc5ac728e68423 (patch)
tree9f266716edfa144c26bde916aad2f8b2cb3ec48e /src/com/android/launcher3/PinchAnimationManager.java
parentb434fde42702000cfb8eacfdfc85c2f759be0a75 (diff)
downloadandroid_packages_apps_Trebuchet-966d901af0fd319aa2b62d6abccc5ac728e68423.tar.gz
android_packages_apps_Trebuchet-966d901af0fd319aa2b62d6abccc5ac728e68423.tar.bz2
android_packages_apps_Trebuchet-966d901af0fd319aa2b62d6abccc5ac728e68423.zip
Removing QsbBlockerView
> Removing workspace state change listener. State change happens with hardware layer, so children should not be calling invalidatge() during the animation > Moving QSB inside the QSB and removing a floating layout Bug: 37616877 Change-Id: I9af3522a05dafa5796586bb64f512d98688caf79
Diffstat (limited to 'src/com/android/launcher3/PinchAnimationManager.java')
-rw-r--r--src/com/android/launcher3/PinchAnimationManager.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/com/android/launcher3/PinchAnimationManager.java b/src/com/android/launcher3/PinchAnimationManager.java
index f8196e5f6..c3d3bb3df 100644
--- a/src/com/android/launcher3/PinchAnimationManager.java
+++ b/src/com/android/launcher3/PinchAnimationManager.java
@@ -56,11 +56,10 @@ public class PinchAnimationManager {
private static final LinearInterpolator INTERPOLATOR = new LinearInterpolator();
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;
+ private static final int INDEX_OVERVIEW_PANEL_BUTTONS = 1;
+ private static final int INDEX_SCRIM = 2;
- private final Animator[] mAnimators = new Animator[4];
+ private final Animator[] mAnimators = new Animator[3];
private Launcher mLauncher;
private Workspace mWorkspace;
@@ -196,8 +195,6 @@ public class PinchAnimationManager {
private void animateHotseatAndQsb(boolean 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) {