Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c96f0cc3 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Merge branch 'ub-launcher3-master' into launcher3merge2018-10-03 

Test: will rely on presubmit
Bug: 116879058
Change-Id: Ifa5b85f0ce5099525d05feee265c7eb54823f560
parents 1c022d77 69c9e433

quickstep/libs/sysui_shared.jar

+1.28 KiB (139 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

quickstep/src/com/android/launcher3/uioverrides/StatusBarTouchController.java

+2 −1
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ public class StatusBarTouchController implements TouchController { 
        }

        if (action == ACTION_MOVE) {

            float dy = ev.getY() - mTranslator.getDownY();

            if (dy > mTouchSlop) {

            float dx = ev.getX() - mTranslator.getDownX();

            if (dy > mTouchSlop && dy > Math.abs(dx)) {

                mTranslator.dispatchDownEvents(ev);

                mTranslator.processMotionEvent(ev);

                return true;

quickstep/src/com/android/launcher3/uioverrides/TaskViewTouchController.java

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
    }



    @Override

    public boolean onDrag(float displacement, float velocity) {

    public boolean onDrag(float displacement) {

        float totalDisplacement = displacement + mDisplacementShift;

        boolean isGoingUp =

                totalDisplacement == 0 ? mCurrentAnimationIsGoingUp : totalDisplacement < 0;

quickstep/src/com/android/quickstep/ActivityControlHelper.java

+6 −5
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> { 
     * Updates the UI to indicate quick interaction.

     */

    void onQuickInteractionStart(T activity, @Nullable RunningTaskInfo taskInfo,

            boolean activityVisible);

            boolean activityVisible, TouchInteractionLog touchInteractionLog);



    float getTranslationYForQuickScrub(TransformedRect targetRect, DeviceProfile dp,

            Context context);
@@ -153,13 +153,14 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> { 


        @Override

        public void onQuickInteractionStart(Launcher activity, RunningTaskInfo taskInfo,

                boolean activityVisible) {

                boolean activityVisible, TouchInteractionLog touchInteractionLog) {

            LauncherState fromState = activity.getStateManager().getState();

            activity.getStateManager().goToState(FAST_OVERVIEW, activityVisible);



            QuickScrubController controller = activity.<RecentsView>getOverviewPanel()

                    .getQuickScrubController();

            controller.onQuickScrubStart(activityVisible && !fromState.overviewUi, this);

            controller.onQuickScrubStart(activityVisible && !fromState.overviewUi, this,

                    touchInteractionLog);



            if (!activityVisible) {

                // For the duration of the gesture, lock the screen orientation to ensure that we
@@ -425,14 +426,14 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> { 


        @Override

        public void onQuickInteractionStart(RecentsActivity activity, RunningTaskInfo taskInfo,

                boolean activityVisible) {

                boolean activityVisible, TouchInteractionLog touchInteractionLog) {

            QuickScrubController controller = activity.<RecentsView>getOverviewPanel()

                    .getQuickScrubController();



            // TODO: match user is as well

            boolean startingFromHome = !activityVisible &&

                    (taskInfo == null || Objects.equals(taskInfo.topActivity, mHomeComponent));

            controller.onQuickScrubStart(startingFromHome, this);

            controller.onQuickScrubStart(startingFromHome, this, touchInteractionLog);

            if (activityVisible) {

                mUiHandler.postDelayed(controller::onFinishedTransitionToQuickScrub,

                        OVERVIEW_TRANSITION_MS);

quickstep/src/com/android/quickstep/DeferredTouchConsumer.java

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ public class DeferredTouchConsumer implements TouchConsumer { 
    }



    @Override

    public void updateTouchTracking(int interactionType) {

        mTarget.updateTouchTracking(interactionType);

    public void onQuickScrubStart() {

        mTarget.onQuickScrubStart();

    }



    @Override