PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix recents attached state when quick switching" into ub-launcher3-qt-dev

Browse Source
This commit is contained in:
Tony Wickham
2019-05-06 17:44:35 +00:00
committed by Android (Google) Code Review
parent 0e44900863 5bc79a2f6b
commit 752df2ce3b
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/recents_ui_overrides/src/com/android/quickstep/OtherActivityInputConsumer.java
+9 -11
View File
@@ -21,7 +21,6 @@ import static android.view.MotionEvent.ACTION_MOVE;
import static android.view.MotionEvent.ACTION_POINTER_UP; import static android.view.MotionEvent.ACTION_POINTER_UP;
import static android.view.MotionEvent.ACTION_UP; import static android.view.MotionEvent.ACTION_UP;
import static android.view.MotionEvent.INVALID_POINTER_ID; import static android.view.MotionEvent.INVALID_POINTER_ID;
import static com.android.launcher3.Utilities.EDGE_NAV_BAR; import static com.android.launcher3.Utilities.EDGE_NAV_BAR;
import static com.android.launcher3.util.RaceConditionTracker.ENTER; import static com.android.launcher3.util.RaceConditionTracker.ENTER;
import static com.android.launcher3.util.RaceConditionTracker.EXIT; import static com.android.launcher3.util.RaceConditionTracker.EXIT;
@@ -44,6 +43,8 @@ import android.view.VelocityTracker;
import android.view.ViewConfiguration; import android.view.ViewConfiguration;
import android.view.WindowManager; import android.view.WindowManager;
import androidx.annotation.UiThread;
import com.android.launcher3.R; import com.android.launcher3.R;
import com.android.launcher3.graphics.RotationMode; import com.android.launcher3.graphics.RotationMode;
import com.android.launcher3.util.Preconditions; import com.android.launcher3.util.Preconditions;
@@ -62,8 +63,6 @@ import com.android.systemui.shared.system.QuickStepContract;
import java.util.function.Consumer; import java.util.function.Consumer;
import androidx.annotation.UiThread;
/** /**
* Input consumer for handling events originating from an activity other than Launcher * Input consumer for handling events originating from an activity other than Launcher
*/ */
@@ -108,7 +107,6 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
// Might be displacement in X or Y, depending on the direction we are swiping from the nav bar. // Might be displacement in X or Y, depending on the direction we are swiping from the nav bar.
private float mStartDisplacement; private float mStartDisplacement;
private float mStartDisplacementX;
private Handler mMainThreadHandler; private Handler mMainThreadHandler;
private Runnable mCancelRecentsAnimationRunnable = () -> { private Runnable mCancelRecentsAnimationRunnable = () -> {
@@ -227,7 +225,6 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
if (Math.abs(displacement) > mDragSlop) { if (Math.abs(displacement) > mDragSlop) {
mPassedDragSlop = true; mPassedDragSlop = true;
mStartDisplacement = displacement; mStartDisplacement = displacement;
mStartDisplacementX = displacementX;
} }
} }
} }
@@ -244,19 +241,20 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
if (!mPassedDragSlop) { if (!mPassedDragSlop) {
mPassedDragSlop = true; mPassedDragSlop = true;
mStartDisplacement = displacement; mStartDisplacement = displacement;
mStartDisplacementX = displacementX;
} }
notifyGestureStarted(); notifyGestureStarted();
} }
} }
if (mPassedDragSlop && mInteractionHandler != null) { if (mInteractionHandler != null) {
// Move if (mPassedDragSlop) {
mInteractionHandler.updateDisplacement(displacement - mStartDisplacement); // Move
mInteractionHandler.updateDisplacement(displacement - mStartDisplacement);
}
if (mMode == Mode.NO_BUTTON) { if (mMode == Mode.NO_BUTTON) {
float horizontalDist = Math.abs(displacementX - mStartDisplacementX); float horizontalDist = Math.abs(displacementX);
float upDist = -(displacement - mStartDisplacement); float upDist = -displacement;
boolean isLikelyToStartNewTask = horizontalDist > upDist; boolean isLikelyToStartNewTask = horizontalDist > upDist;
mMotionPauseDetector.setDisallowPause(upDist < mMotionPauseMinDisplacement mMotionPauseDetector.setDisallowPause(upDist < mMotionPauseMinDisplacement
|| isLikelyToStartNewTask); || isLikelyToStartNewTask);