Revert "Merge branch 'ub-launcher3-master' into pi-dev"

Original CL loses the commit history. I believe this is due to doing the merge on master and cherry picking to pi-dev. Tested locally that reverting this results in no conflicts when doing the merge properly on pi-dev.

This reverts commit 3f7df53dda.

Bug: 74794600
Test: manual test
Change-Id: I58f3bb1bd5ce789be380bac9716efd2627a90f92
This commit is contained in:
Jonathan Miranda
2018-03-27 00:10:24 +00:00
committed by Jon
parent 3f7df53dda
commit 6cf6dd8bce
273 changed files with 5529 additions and 4244 deletions
@@ -31,12 +31,13 @@ import com.android.launcher3.DeviceProfile;
import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherState;
import com.android.launcher3.anim.SpringAnimationHandler;
import com.android.launcher3.dragndrop.DragLayer;
import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
import com.android.launcher3.util.VerticalSwipeController;
import com.android.quickstep.views.RecentsView;
import com.android.quickstep.RecentsView;
class EventLogTags {
private EventLogTags() {
@@ -141,6 +142,11 @@ public class EdgeSwipeController extends VerticalSwipeController implements
}
}
@Override
protected void initSprings() {
mSpringHandlers = new SpringAnimationHandler[0];
}
@Override
protected float getShiftRange() {
return getShiftRange(mLauncher);