[omni] Read and use touch slop multiplier for LPNH.
1) This part is missing from the previous set of CLs. `getLPNHCustomSlopMultiplier` is defined but unused. Similar as reading LPNHDuration, we should also read the touch slot multiplier in Launcher for LPNH.
2) Also, change type to float, which is consistent with our existing implementation and the definition in OverviewProxyService.
3) Slop value is in percentage and Launcher divide it by 100. We haven't got AGSA implementation yet so we can predefine this part.
Bug: 330444720
Bug: 330446188
Test: manual
Flag: legacy CUSTOM_LPNH_THRESHOLDS disabled
Change-Id: Id606a4bc765fe01464ef36a2806c280ee42d30cd
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 43e564c..4b4f914 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -67,6 +67,7 @@
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 @@
private final DisplayController mDisplayController;
private final GestureExclusionManager mExclusionManager;
-
+ private final AssistStateManager mAssistStateManager;
private final RotationTouchHelper mRotationTouchHelper;
private final TaskStackChangeListener mPipListener;
@@ -147,6 +148,7 @@
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 @@
: 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;
diff --git a/quickstep/src/com/android/quickstep/util/AssistStateManager.java b/quickstep/src/com/android/quickstep/util/AssistStateManager.java
index a1fdbbb..87d5138 100644
--- a/quickstep/src/com/android/quickstep/util/AssistStateManager.java
+++ b/quickstep/src/com/android/quickstep/util/AssistStateManager.java
@@ -58,7 +58,7 @@
}
/** Get the Launcher overridden long press touch slop multiplier to trigger Assistant. */
- public Optional<Long> getLPNHCustomSlopMultiplier() {
+ public Optional<Float> getLPNHCustomSlopMultiplier() {
return Optional.empty();
}