Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"
This reverts commit 7344766886.
Reason for revert: b/282035015
Change-Id: I38db287f730048d3e1e5041f1853bdae214e1a66
This commit is contained in:
1 parent
7344766886
commit
662787540c
10 files changed
+37
-188
No files matched your search
+5
-24
@@ -37,7 +37,6 @@ import com.android.launcher3.R;
|
||||
import com.android.launcher3.Utilities;
|
||||
import com.android.launcher3.taskbar.TaskbarActivityContext;
|
||||
import com.android.launcher3.taskbar.TaskbarTranslationController.TransitionCallback;
|
||||
import com.android.launcher3.taskbar.bubbles.BubbleControllers;
|
||||
import com.android.launcher3.touch.OverScroll;
|
||||
import com.android.launcher3.util.DisplayController;
|
||||
import com.android.quickstep.InputConsumer;
|
||||
@@ -63,7 +62,6 @@ public class TaskbarUnstashInputConsumer extends DelegateInputConsumer {
|
||||
private final int mTaskbarNavThresholdY;
|
||||
private final boolean mIsTaskbarAllAppsOpen;
|
||||
private boolean mHasPassedTaskbarNavThreshold;
|
||||
private boolean mIsInBubbleBarArea;
|
||||
|
||||
private final PointF mDownPos = new PointF();
|
||||
private final PointF mLastPos = new PointF();
|
||||
@@ -137,7 +135,7 @@ public class TaskbarUnstashInputConsumer extends DelegateInputConsumer {
|
||||
mHasPassedTaskbarNavThreshold = false;
|
||||
mTaskbarActivityContext.setAutohideSuspendFlag(
|
||||
FLAG_AUTOHIDE_SUSPEND_TOUCHING, true);
|
||||
if (isInTaskbarArea(x)) {
|
||||
if (isInArea(x)) {
|
||||
if (!mIsTransientTaskbar) {
|
||||
mLongPressDownX = x;
|
||||
mLongPressDownY = y;
|
||||
@@ -146,12 +144,10 @@ public class TaskbarUnstashInputConsumer extends DelegateInputConsumer {
|
||||
mCanceledUnstashHint = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (mTransitionCallback != null && !mIsTaskbarAllAppsOpen) {
|
||||
mTransitionCallback.onActionDown();
|
||||
}
|
||||
if (mIsTransientTaskbar && isInBubbleBarArea(x)) {
|
||||
mIsInBubbleBarArea = true;
|
||||
}
|
||||
break;
|
||||
case MotionEvent.ACTION_POINTER_UP:
|
||||
int ptrIdx = ev.getActionIndex();
|
||||
@@ -188,11 +184,7 @@ public class TaskbarUnstashInputConsumer extends DelegateInputConsumer {
|
||||
|
||||
if (!mHasPassedTaskbarNavThreshold && passedTaskbarNavThreshold) {
|
||||
mHasPassedTaskbarNavThreshold = true;
|
||||
if (mIsInBubbleBarArea) {
|
||||
mTaskbarActivityContext.onSwipeToOpenBubblebar();
|
||||
} else {
|
||||
mTaskbarActivityContext.onSwipeToUnstashTaskbar();
|
||||
}
|
||||
mTaskbarActivityContext.onSwipeToUnstashTaskbar();
|
||||
}
|
||||
|
||||
if (dY < 0) {
|
||||
@@ -215,32 +207,21 @@ public class TaskbarUnstashInputConsumer extends DelegateInputConsumer {
|
||||
mTransitionCallback.onActionEnd();
|
||||
}
|
||||
mHasPassedTaskbarNavThreshold = false;
|
||||
mIsInBubbleBarArea = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isInTaskbarArea(float x) {
|
||||
private boolean isInArea(float x) {
|
||||
float areaFromMiddle = mUnstashArea / 2.0f;
|
||||
float distFromMiddle = Math.abs(mScreenWidth / 2.0f - x);
|
||||
return distFromMiddle < areaFromMiddle;
|
||||
}
|
||||
|
||||
private boolean isInBubbleBarArea(float x) {
|
||||
if (mTaskbarActivityContext != null && mIsTransientTaskbar) {
|
||||
BubbleControllers controllers = mTaskbarActivityContext.getBubbleControllers();
|
||||
if (controllers == null) return false;
|
||||
Rect bubbleBarBounds = controllers.bubbleBarViewController.getBubbleBarBounds();
|
||||
return x >= bubbleBarBounds.left && x <= bubbleBarBounds.right;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private void onLongPressDetected(MotionEvent motionEvent) {
|
||||
if (mTaskbarActivityContext != null
|
||||
&& isInTaskbarArea(motionEvent.getRawX())
|
||||
&& isInArea(motionEvent.getRawX())
|
||||
&& !mIsTransientTaskbar) {
|
||||
boolean taskBarPressed = mTaskbarActivityContext.onLongPressToUnstashTaskbar();
|
||||
if (taskBarPressed) {
|
||||
|
||||
Reference in new issue
Block a user