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

Commit f8238a62 authored by Mateusz Cicheński's avatar Mateusz Cicheński
Browse files

Remove fling gesture related flags for PiP and Bubbles 

Bug: 296239686
Bug: 296239159
Test: fling dismiss bubble, no dismiss on PiP fling

Change-Id: I3bf1411cd4424801dadf411b22c72a1f30ecb10d
parent 64261eba

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java

+0 −7
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import android.graphics.Rect; 
import android.graphics.RectF;

import android.graphics.drawable.ColorDrawable;

import android.os.Bundle;

import android.os.SystemProperties;

import android.provider.Settings;

import android.util.Log;

import android.view.Choreographer;
@@ -108,12 +107,6 @@ import java.util.stream.Collectors; 
 */

public class BubbleStackView extends FrameLayout

        implements ViewTreeObserver.OnComputeInternalInsetsListener {



    // LINT.IfChange

    public static final boolean ENABLE_FLING_TO_DISMISS_BUBBLE =

            SystemProperties.getBoolean("persist.wm.debug.fling_to_dismiss_bubble", true);

    // LINT.ThenChange(com/android/launcher3/taskbar/bubbles/BubbleDismissController.java)



    private static final String TAG = TAG_WITH_CLASS_NAME ? "BubbleStackView" : TAG_BUBBLES;



    /** How far the flyout needs to be dragged before it's dismissed regardless of velocity. */

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/ExpandedAnimationController.java

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.bubbles.animation; 
import static android.view.View.LAYOUT_DIRECTION_RTL;



import static com.android.wm.shell.bubbles.BubblePositioner.NUM_VISIBLE_WHEN_RESTING;

import static com.android.wm.shell.bubbles.BubbleStackView.ENABLE_FLING_TO_DISMISS_BUBBLE;



import android.content.res.Resources;

import android.graphics.Path;
@@ -355,7 +354,6 @@ public class ExpandedAnimationController 
        mMagnetizedBubbleDraggingOut.setMagnetListener(listener);

        mMagnetizedBubbleDraggingOut.setHapticsEnabled(true);

        mMagnetizedBubbleDraggingOut.setFlingToTargetMinVelocity(FLING_TO_DISMISS_MIN_VELOCITY);

        mMagnetizedBubbleDraggingOut.setFlingToTargetEnabled(ENABLE_FLING_TO_DISMISS_BUBBLE);

    }



    private void springBubbleTo(View bubble, float x, float y) {

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/StackAnimationController.java

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.wm.shell.bubbles.animation;



import static com.android.wm.shell.bubbles.BubblePositioner.NUM_VISIBLE_WHEN_RESTING;

import static com.android.wm.shell.bubbles.BubbleStackView.ENABLE_FLING_TO_DISMISS_BUBBLE;



import android.content.ContentResolver;

import android.content.res.Resources;
@@ -1026,7 +1025,6 @@ public class StackAnimationController extends 
            };

            mMagnetizedStack.setHapticsEnabled(true);

            mMagnetizedStack.setFlingToTargetMinVelocity(FLING_TO_DISMISS_MIN_VELOCITY);

            mMagnetizedStack.setFlingToTargetEnabled(ENABLE_FLING_TO_DISMISS_BUBBLE);

        }



        final ContentResolver contentResolver = mLayout.getContext().getContentResolver();

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMotionHelper.java

+3 −7
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.content.Context; 
import android.graphics.PointF;

import android.graphics.Rect;

import android.os.Debug;

import android.os.SystemProperties;



import com.android.internal.protolog.common.ProtoLog;

import com.android.wm.shell.R;
@@ -48,19 +47,16 @@ import com.android.wm.shell.pip.PipTaskOrganizer; 
import com.android.wm.shell.pip.PipTransitionController;

import com.android.wm.shell.protolog.ShellProtoLogGroup;



import java.util.function.Consumer;



import kotlin.Unit;

import kotlin.jvm.functions.Function0;



import java.util.function.Consumer;



/**

 * A helper to animate and manipulate the PiP.

 */

public class PipMotionHelper implements PipAppOpsListener.Callback,

        FloatingContentCoordinator.FloatingContent {



    public static final boolean ENABLE_FLING_TO_DISMISS_PIP =

            SystemProperties.getBoolean("persist.wm.debug.fling_to_dismiss_pip", false);

    private static final String TAG = "PipMotionHelper";

    private static final boolean DEBUG = false;
@@ -707,7 +703,7 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, 
                    loc[1] = animatedPipBounds.top;

                }

            };

            mMagnetizedPip.setFlingToTargetEnabled(ENABLE_FLING_TO_DISMISS_PIP);

            mMagnetizedPip.setFlingToTargetEnabled(false);

        }



        return mMagnetizedPip;

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −10
Original line number Diff line number Diff line
@@ -502,16 +502,6 @@ object Flags { 
    val WM_CAPTION_ON_SHELL =

        sysPropBooleanFlag("persist.wm.debug.caption_on_shell", default = true)



    @Keep

    @JvmField

    val ENABLE_FLING_TO_DISMISS_BUBBLE =

        sysPropBooleanFlag("persist.wm.debug.fling_to_dismiss_bubble", default = true)



    @Keep

    @JvmField

    val ENABLE_FLING_TO_DISMISS_PIP =

        sysPropBooleanFlag("persist.wm.debug.fling_to_dismiss_pip", default = true)



    // TODO(b/256873975): Tracking Bug

    @JvmField

    @Keep