Merge "Remove fling gesture related flags for PiP and Bubbles" into udc-qpr-dev am: cdb5f1036b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24448712

Change-Id: Ic9b709185d5b63fdf252f4f5edcb5d44a8327fdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mateusz Cicheński
2023-08-19 02:25:05 +00:00
committed by Automerger Merge Worker

View File

@@ -17,7 +17,6 @@ package com.android.launcher3.taskbar.bubbles;
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import android.os.SystemProperties;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
@@ -43,10 +42,6 @@ import com.android.wm.shell.common.magnetictarget.MagnetizedObject;
public class BubbleDismissController {
private static final String TAG = BubbleDismissController.class.getSimpleName();
private static final float FLING_TO_DISMISS_MIN_VELOCITY = 6000f;
// LINT.IfChange
private static final boolean ENABLE_FLING_TO_DISMISS_BUBBLE =
SystemProperties.getBoolean("persist.wm.debug.fling_to_dismiss_bubble", true);
// LINT.ThenChange(com/android/wm/shell/bubbles/BubbleStackView.java)
private final TaskbarActivityContext mActivity;
private final TaskbarDragLayer mDragLayer;
@Nullable
@@ -182,7 +177,6 @@ public class BubbleDismissController {
};
mMagnetizedObject.setHapticsEnabled(true);
mMagnetizedObject.setFlingToTargetEnabled(ENABLE_FLING_TO_DISMISS_BUBBLE);
mMagnetizedObject.setFlingToTargetMinVelocity(FLING_TO_DISMISS_MIN_VELOCITY);
if (mMagneticTarget != null) {
mMagnetizedObject.addTarget(mMagneticTarget);