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

Commit 44abf2e7 authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Automerger Merge Worker
Browse files

Merge "Remove fling gesture related flags for PiP and Bubbles" into...

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

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



Change-Id: I68ca5003f650855e1959bc44e2aa73ff6623a9f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 58640fa5 3744f371
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -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);