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

Commit 4898f658 authored by Xin Li's avatar Xin Li
Browse files

Merge QQ3A.200605.002 into master 

Bug: 158095402
Merged-In: Ia11967c6f4cb86b5431cdb446a5b5c483ce09ba2
Change-Id: Ia4cca2b1f45bd269b90f9d66f40bee7b66e07b5d
parents f6bfbe76 6cf1e6ca

protos/launcher_log.proto

+2 −1
Original line number Diff line number Diff line
@@ -137,7 +137,8 @@ message Action { 
    AUTOMATED = 1;

    COMMAND = 2;

    TIP = 3;

    // SOFT_KEYBOARD, HARD_KEYBOARD, ASSIST

    SOFT_KEYBOARD = 4;

    // HARD_KEYBOARD, ASSIST

  }



  enum Touch {

quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java

+6 −1
Original line number Diff line number Diff line
@@ -386,6 +386,10 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten 
        // rounding at the end of the animation.

        float startRadius = mClipAnimationHelper.getCurrentCornerRadius();

        float endRadius = startRect.width() / 6f;



        float startTransformProgress = mTransformParams.getProgress();

        float endTransformProgress = 1;



        // We want the window alpha to be 0 once this threshold is met, so that the

        // FolderIconView can be seen morphing into the icon shape.

        final float windowAlphaThreshold = isFloatingIconView ? 1f - SHAPE_PROGRESS_DURATION : 1f;
@@ -409,7 +413,8 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten 
            public void onUpdate(RectF currentRect, float progress) {

                homeAnim.setPlayFraction(progress);



                mTransformParams.setProgress(progress)

                mTransformParams.setProgress(

                        Utilities.mapRange(progress, startTransformProgress, endTransformProgress))

                        .setCurrentRectAndTargetAlpha(currentRect, getWindowAlpha(progress));

                if (isFloatingIconView) {

                    mTransformParams.setCornerRadius(endRadius * progress + startRadius

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

+13 −4
Original line number Diff line number Diff line
@@ -563,9 +563,13 @@ public class TouchInteractionService extends Service implements 
                // not interrupt it. QuickSwitch assumes that interruption can only happen if the

                // next gesture is also quick switch.

                mUncheckedConsumer =

                        new AssistantTouchConsumer(this, mISystemUiProxy,

                        new AssistantTouchConsumer(

                                this,

                                mISystemUiProxy,

                                mOverviewComponentObserver.getActivityControlHelper(),

                                InputConsumer.NO_OP, mInputMonitorCompat);

                                InputConsumer.NO_OP,

                                mInputMonitorCompat,

                                mOverviewComponentObserver.assistantGestureIsConstrained());

            } else {

                mUncheckedConsumer = InputConsumer.NO_OP;

            }
@@ -612,8 +616,13 @@ public class TouchInteractionService extends Service implements 
            final ActivityControlHelper activityControl =

                    mOverviewComponentObserver.getActivityControlHelper();

            if (canTriggerAssistantAction(event)) {

                base = new AssistantTouchConsumer(this, mISystemUiProxy, activityControl, base,

                        mInputMonitorCompat);

                base = new AssistantTouchConsumer(

                        this,

                        mISystemUiProxy,

                        activityControl,

                        base,

                        mInputMonitorCompat,

                        mOverviewComponentObserver.assistantGestureIsConstrained());

            }



            if ((mSystemUiStateFlags & SYSUI_STATE_SCREEN_PINNING) != 0) {

quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsRootView.java

+2 −1
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ public class RecentsRootView extends BaseDragLayer<RecentsActivity> { 
        if (!insets.equals(mInsets)) {

            super.setInsets(insets);

        }

        setBackground(insets.top == 0 ? null

        setBackground(insets.top == 0  || !mAllowSysuiScrims

                ? null

                : Themes.getAttrDrawable(getContext(), R.attr.workspaceStatusBarScrim));

    }

quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AssistantTouchConsumer.java

+8 −5
Original line number Diff line number Diff line
@@ -91,14 +91,16 @@ public class AssistantTouchConsumer extends DelegateInputConsumer { 
    private final ISystemUiProxy mSysUiProxy;

    private final Context mContext;

    private final GestureDetector mGestureDetector;

    private final boolean mIsAssistGestureConstrained;



    public AssistantTouchConsumer(Context context, ISystemUiProxy systemUiProxy,

            ActivityControlHelper activityControlHelper, InputConsumer delegate,

            InputMonitorCompat inputMonitor) {

        InputMonitorCompat inputMonitor, boolean isAssistGestureConstrained) {

        super(delegate, inputMonitor);

        final Resources res = context.getResources();

        mContext = context;

        mSysUiProxy = systemUiProxy;

        mIsAssistGestureConstrained = isAssistGestureConstrained;

        mDragDistThreshold = res.getDimension(R.dimen.gestures_assistant_drag_threshold);

        mFlingDistThreshold = res.getDimension(R.dimen.gestures_assistant_fling_threshold);

        mTimeThreshold = res.getInteger(R.integer.assistant_gesture_min_time_threshold);
@@ -273,7 +275,8 @@ public class AssistantTouchConsumer extends DelegateInputConsumer { 
    private class AssistantGestureListener extends SimpleOnGestureListener {

        @Override

        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {

            if (isValidAssistantGestureAngle(velocityX, -velocityY)

            if (!mIsAssistGestureConstrained

                    && isValidAssistantGestureAngle(velocityX, -velocityY)

                    && mDistance >= mFlingDistThreshold

                    && !mLaunchedAssistant

                    && mState != STATE_DELEGATE_ACTIVE) {