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

Commit 887a88f1 authored by Holly Jiuyu Sun's avatar Holly Jiuyu Sun Committed by Android (Google) Code Review
Browse files

Merge "[omni] Read and use touch slop multiplier for LPNH." into main

parents cb8ad6ed 9b11c40b

quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java

+5 −3
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import com.android.launcher3.util.NavigationMode; 
import com.android.launcher3.util.SettingsCache;

import com.android.quickstep.TopTaskTracker.CachedTaskInfo;

import com.android.quickstep.util.ActiveGestureLog;

import com.android.quickstep.util.AssistStateManager;

import com.android.quickstep.util.GestureExclusionManager;

import com.android.quickstep.util.GestureExclusionManager.ExclusionListener;

import com.android.quickstep.util.NavBarPosition;
@@ -96,7 +97,7 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E 
    private final DisplayController mDisplayController;



    private final GestureExclusionManager mExclusionManager;



    private final AssistStateManager mAssistStateManager;



    private final RotationTouchHelper mRotationTouchHelper;

    private final TaskStackChangeListener mPipListener;
@@ -147,6 +148,7 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E 
        mContext = context;

        mDisplayController = DisplayController.INSTANCE.get(context);

        mExclusionManager = exclusionManager;

        mAssistStateManager = AssistStateManager.INSTANCE.get(context);

        mIsOneHandedModeSupported = SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false);

        mRotationTouchHelper = RotationTouchHelper.INSTANCE.get(context);

        if (isInstanceForTouches) {
@@ -587,8 +589,8 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E 
                : QUICKSTEP_TOUCH_SLOP_RATIO_TWO_BUTTON;

        float touchSlop = ViewConfiguration.get(mContext).getScaledTouchSlop();



        if (DeviceConfigWrapper.get().getCustomLpnhThresholds()) {

            float customSlopMultiplier = DeviceConfigWrapper.get().getLpnhSlopPercentage() / 100f;

        if (mAssistStateManager.getLPNHCustomSlopMultiplier().isPresent()) {

            float customSlopMultiplier = mAssistStateManager.getLPNHCustomSlopMultiplier().get();

            return customSlopMultiplier * slopMultiplier * touchSlop;

        } else {

            return slopMultiplier * touchSlop;

quickstep/src/com/android/quickstep/util/AssistStateManager.java

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class AssistStateManager implements ResourceBasedOverride { 
    }



    /** Get the Launcher overridden long press touch slop multiplier to trigger Assistant. */

    public Optional<Long> getLPNHCustomSlopMultiplier() {

    public Optional<Float> getLPNHCustomSlopMultiplier() {

        return Optional.empty();

    }