commit bd3a29506113ad816b4c42322583aa28cf4b4570
author Hyunyoung Song <hyunyoungs@google.com> Thu Jul 07 23:24:01 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 07 23:24:01 2016 +0000
tree 542a5f86ec10cde511492844891e73f6b6863407
parent 743eb74ca9d68d4b274ea0c58ce6cdbef9b2eacd
parent 2359a6801792a0cc88bda30a9874416b2d101175

Do not remove onLayoutChangeListener on hotseat inside AllAppsTransitionController
am: 2359a68017

Change-Id: Ic42689cd37eee3d3784c94f8b8ad8e32d105e587

src/com/android/launcher3/allapps/AllAppsTransitionController.java

diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 0babc1a..b42b762 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -65,6 +65,8 @@
     private float mShiftCurrent;    // [0, mShiftRange]
     private float mShiftRange;      // changes depending on the orientation
 
+    private static final float DEFAULT_SHIFT_RANGE = 10;
+
 
     private static final float RECATCH_REJECTION_FRACTION = .0875f;
 
@@ -81,6 +83,7 @@
         mLauncher = launcher;
         mDetector = new VerticalPullDetector(launcher);
         mDetector.setListener(this);
+        mShiftCurrent = mShiftRange = DEFAULT_SHIFT_RANGE;
         mBezelSwipeUpHeight = launcher.getResources().getDimensionPixelSize(
                 R.dimen.all_apps_bezel_swipe_height);
     }
@@ -436,14 +439,12 @@
     @Override
     public void onLayoutChange(View v, int left, int top, int right, int bottom,
             int oldLeft, int oldTop, int oldRight, int oldBottom) {
+        float prevShiftRatio = mShiftCurrent / mShiftRange;
         if (!mLauncher.getDeviceProfile().isVerticalBarLayout()) {
             mShiftRange = top;
         } else {
             mShiftRange = bottom;
         }
-        if (!mLauncher.isAllAppsVisible()) {
-            setProgress(mShiftRange);
-        }
-        mHotseat.removeOnLayoutChangeListener(this);
+        setProgress(mShiftRange * prevShiftRatio);
     }
 }