Merge "Don't stash immediately when drag was canceled" into tm-qpr-dev

            mControllers.taskbarAutohideSuspendController.updateFlag(

                    TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_DRAGGING, false);

            mActivity.onDragEnd();

            // Note, this must be done last to ensure no AutohideSuspendFlags are active, as that

            // will prevent us from stashing until the timeout.

            if (mReturnAnimator == null) {

                // Upon successful drag, immediately stash taskbar.

                // Note, this must be done last to ensure no AutohideSuspendFlags are active, as

                // that will prevent us from stashing until the timeout.

                mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(true);

            }

        }

    }

    @Override

    protected void endDrag() {

                    callOnDragEnd();

                    dragView.remove();

                    dragView.clearAnimation();

                    // Do this after callOnDragEnd(), because we use mReturnAnimator != null to

                    // imply the drag was canceled rather than successful.

                    mReturnAnimator = null;

                }

            });

            mReturnAnimator.start();

                syncer.addToSync(syncId, viewRoot.getView());

                syncer.addTransactionToSync(syncId, transaction);

                syncer.markSyncReady(syncId);

                // Do this after maybeOnDragEnd(), because we use mReturnAnimator != null to imply

                // the drag was canceled rather than successful.

                mReturnAnimator = null;

            }

        });