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

Commit 98935783 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Don't close popup container if touch came from nav bar" into ub-launcher3-master

parents 9b4c82cb d5a3df7b

quickstep/recents_ui_overrides/src/com/android/quickstep/OtherActivityInputConsumer.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import static android.view.MotionEvent.INVALID_POINTER_ID; 


import static com.android.launcher3.util.RaceConditionTracker.ENTER;

import static com.android.launcher3.util.RaceConditionTracker.EXIT;

import static com.android.quickstep.TouchInteractionService.EDGE_NAV_BAR;

import static com.android.launcher3.Utilities.EDGE_NAV_BAR;

import static com.android.quickstep.TouchInteractionService.TOUCH_INTERACTION_LOG;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;

quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewInputConsumer.java

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.view.MotionEvent; 
import android.view.ViewConfiguration;



import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.Utilities;

import com.android.launcher3.views.BaseDragLayer;

import com.android.quickstep.util.CachedEventDispatcher;

import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -139,7 +140,7 @@ public class OverviewInputConsumer<T extends BaseDraggingActivity> 
            return;

        }

        int flags = ev.getEdgeFlags();

        ev.setEdgeFlags(flags | TouchInteractionService.EDGE_NAV_BAR);

        ev.setEdgeFlags(flags | Utilities.EDGE_NAV_BAR);

        ev.offsetLocation(-mLocationOnScreen[0], -mLocationOnScreen[1]);

        if (ev.getAction() == ACTION_DOWN) {

            mTarget.onInterceptTouchEvent(ev);

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

+0 −2
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ public class TouchInteractionService extends Service { 
    public static final EventLogArray TOUCH_INTERACTION_LOG =

            new EventLogArray("touch_interaction_log", 40);



    public static final int EDGE_NAV_BAR = 1 << 8;



    private static final String TAG = "TouchInteractionService";



    private final IBinder mMyBinder = new IOverviewProxy.Stub() {

quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS; 
import static com.android.launcher3.uioverrides.TaskViewTouchController.SUCCESS_TRANSITION_PROGRESS;

import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;

import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;

import static com.android.quickstep.TouchInteractionService.EDGE_NAV_BAR;

import static com.android.launcher3.Utilities.EDGE_NAV_BAR;

import static com.android.quickstep.util.ClipAnimationHelper.TransformParams;



import android.animation.Animator;

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

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ package com.android.launcher3.uioverrides; 


import static com.android.launcher3.LauncherState.NORMAL;

import static com.android.launcher3.LauncherState.OVERVIEW;

import static com.android.quickstep.TouchInteractionService.EDGE_NAV_BAR;

import static com.android.launcher3.Utilities.EDGE_NAV_BAR;



import android.view.MotionEvent;