openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Disable scrolling noti shade on abstract floating view with swipe down 

interactions already doing something else.

Bug: 116143342

Change-Id: If3716de0eb1f7b508c3b74dbe2593ba62fffcf74
This commit is contained in:
Hyunyoung Song 2018-09-19 16:06:16 -07:00
parent 9a9e43461f
commit f58cf5e337
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
quickstep/src/com/android/launcher3/uioverrides/StatusBarTouchController.java
View File

@ -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

5
src/com/android/launcher3/AbstractFloatingView.java
View File

@ -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) {