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

Commit f58cf5e3 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Disable scrolling noti shade on abstract floating view with swipe down 

interactions already doing something else.

Bug: 116143342

Change-Id: If3716de0eb1f7b508c3b74dbe2593ba62fffcf74
parent 9a9e4346

quickstep/src/com/android/launcher3/uioverrides/StatusBarTouchController.java

+4 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.util.Log; 
import android.view.MotionEvent;

import android.view.ViewConfiguration;



import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;
@@ -100,7 +101,9 @@ public class StatusBarTouchController implements TouchController { 
    }



    private boolean canInterceptTouch(MotionEvent ev) {

        if (!mLauncher.isInState(LauncherState.NORMAL)) {

        if (!mLauncher.isInState(LauncherState.NORMAL) ||

                AbstractFloatingView.getTopOpenViewWithType(mLauncher,

                        AbstractFloatingView.TYPE_STATUS_BAR_SWIPE_DOWN_DISALLOW) != null) {

            return false;

        } else {

            // For NORMAL state, only listen if the event originated above the navbar height

src/com/android/launcher3/AbstractFloatingView.java

+5 −0
Original line number Diff line number Diff line
@@ -91,6 +91,11 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch 
    public static final int TYPE_ACCESSIBLE = TYPE_ALL

            & ~TYPE_DISCOVERY_BOUNCE & ~TYPE_QUICKSTEP_PREVIEW;



    // These view all have particular operation associated with swipe down interaction.

    public static final int TYPE_STATUS_BAR_SWIPE_DOWN_DISALLOW = TYPE_WIDGETS_BOTTOM_SHEET |

            TYPE_WIDGETS_FULL_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_ON_BOARD_POPUP |

            TYPE_DISCOVERY_BOUNCE | TYPE_TASK_MENU ;



    protected boolean mIsOpen;



    public AbstractFloatingView(Context context, AttributeSet attrs) {