From 662787540c415afe59547baff48ee5d1b87bf3af Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Thu, 11 May 2023 18:50:35 +0000 Subject: [PATCH] Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash" This reverts commit 7344766886921cb3c170eecac96706567aced051. Reason for revert: b/282035015 Change-Id: I38db287f730048d3e1e5041f1853bdae214e1a66 --- .../taskbar/TaskbarActivityContext.java | 24 +------ .../taskbar/TaskbarInsetsController.kt | 49 ++++---------- .../TaskbarLauncherStateController.java | 10 +-- .../taskbar/TaskbarScrimViewController.java | 6 -- .../taskbar/TaskbarStashController.java | 65 ++++--------------- .../taskbar/TaskbarStashViaTouchController.kt | 20 +----- .../taskbar/TaskbarTranslationController.java | 4 -- .../bubbles/BubbleBarViewController.java | 13 +--- .../bubbles/BubbleStashController.java | 5 +- .../TaskbarUnstashInputConsumer.java | 29 ++------- 10 files changed, 37 insertions(+), 188 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index 8bc1fcacce..d94d8f7fe0 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -444,11 +444,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext { return mControllers.taskbarDragController; } - @Nullable - public BubbleControllers getBubbleControllers() { - return mControllers.bubbleControllers.orElse(null); - } - @Override public ViewCache getViewCache() { return mViewCache; @@ -625,12 +620,8 @@ public class TaskbarActivityContext extends BaseTaskbarContext { mControllers.taskbarForceVisibleImmersiveController.updateSysuiFlags(systemUiStateFlags); mControllers.voiceInteractionWindowController.setIsVoiceInteractionWindowVisible( (systemUiStateFlags & SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING) != 0, fromInit); + mControllers.uiController.updateStateForSysuiFlags(systemUiStateFlags); - mControllers.bubbleControllers.ifPresent(controllers -> { - controllers.bubbleBarController.updateStateForSysuiFlags(systemUiStateFlags); - controllers.bubbleStashedHandleViewController.setIsHomeButtonDisabled( - mControllers.navbarButtonsViewController.isHomeDisabled()); - }); } /** @@ -726,7 +717,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { } } mWindowLayoutParams.height = height; - mControllers.taskbarInsetsController.onTaskbarOrBubblebarWindowHeightOrInsetsChanged(); + mControllers.taskbarInsetsController.onTaskbarWindowHeightOrInsetsChanged(); mWindowManager.updateViewLayout(mDragLayer, mWindowLayoutParams); } @@ -984,19 +975,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext { * Called when we want to unstash taskbar when user performs swipes up gesture. */ public void onSwipeToUnstashTaskbar() { - mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(/* stash= */ false); + mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(false); mControllers.taskbarEduTooltipController.hide(); } - /** - * Called when we want to open bubblebar when user performs swipes up gesture. - */ - public void onSwipeToOpenBubblebar() { - mControllers.bubbleControllers.ifPresent(controllers -> { - controllers.bubbleStashController.showBubbleBar(/* expandBubbles= */ true); - }); - } - /** Returns {@code true} if taskbar All Apps is open. */ public boolean isTaskbarAllAppsOpen() { return mControllers.taskbarAllAppsController.isOpen(); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt index 7adee266c5..4422fd4b75 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt @@ -53,13 +53,13 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas private val touchableRegion: Region = Region() private val insetsOwner: IBinder = Binder() private val deviceProfileChangeListener = { _: DeviceProfile -> - onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + onTaskbarWindowHeightOrInsetsChanged() } private val gestureNavSettingsObserver = GestureNavigationSettingsObserver( context.mainThreadHandler, context, - this::onTaskbarOrBubblebarWindowHeightOrInsetsChanged + this::onTaskbarWindowHeightOrInsetsChanged ) // Initialized in init. @@ -69,7 +69,7 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas fun init(controllers: TaskbarControllers) { this.controllers = controllers windowLayoutParams = context.windowLayoutParams - onTaskbarOrBubblebarWindowHeightOrInsetsChanged() + onTaskbarWindowHeightOrInsetsChanged() context.addOnDeviceProfileChangeListener(deviceProfileChangeListener) gestureNavSettingsObserver.registerForCallingUser() @@ -80,7 +80,7 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas gestureNavSettingsObserver.unregister() } - fun onTaskbarOrBubblebarWindowHeightOrInsetsChanged() { + fun onTaskbarWindowHeightOrInsetsChanged() { if (context.isGestureNav) { windowLayoutParams.providedInsets = arrayOf( @@ -102,33 +102,13 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas ) } - val taskbarTouchableHeight = controllers.taskbarStashController.touchableHeight - val bubblesTouchableHeight = - if (controllers.bubbleControllers.isPresent) - controllers.bubbleControllers.get().bubbleStashController.touchableHeight - else 0 - val touchableHeight = Math.max(taskbarTouchableHeight, bubblesTouchableHeight) - - if ( - controllers.bubbleControllers.isPresent && - controllers.bubbleControllers.get().bubbleStashController.isBubblesShowingOnHome - ) { - val iconBounds = - controllers.bubbleControllers.get().bubbleBarViewController.bubbleBarBounds - touchableRegion.set( - iconBounds.left, - iconBounds.top, - iconBounds.right, - iconBounds.bottom - ) - } else { - touchableRegion.set( - 0, - windowLayoutParams.height - touchableHeight, - context.deviceProfile.widthPx, - windowLayoutParams.height - ) - } + val touchableHeight = controllers.taskbarStashController.touchableHeight + touchableRegion.set( + 0, + windowLayoutParams.height - touchableHeight, + context.deviceProfile.widthPx, + windowLayoutParams.height + ) val contentHeight = controllers.taskbarStashController.contentHeightToReportToApps val tappableHeight = controllers.taskbarStashController.tappableHeightToReportToApps val res = context.resources @@ -217,9 +197,6 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas context.dragLayer, insetsInfo.touchableRegion ) - val bubbleBarVisible = - controllers.bubbleControllers.isPresent && - controllers.bubbleControllers.get().bubbleBarViewController.isBubbleBarVisible() var insetsIsTouchableRegion = true if (context.dragLayer.alpha < AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD) { // Let touches pass through us. @@ -240,9 +217,7 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME) insetsIsTouchableRegion = false } else if ( - controllers.taskbarViewController.areIconsVisible() || - context.isNavBarKidsModeActive || - bubbleBarVisible + controllers.taskbarViewController.areIconsVisible() || context.isNavBarKidsModeActive ) { // Taskbar has some touchable elements, take over the full taskbar area insetsInfo.touchableRegion.set(touchableRegion) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index 2b9d968d82..75cfd05d41 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java @@ -408,14 +408,6 @@ public class TaskbarLauncherStateController { + ", mLauncherState: " + mLauncherState + ", toAlignment: " + toAlignment); } - mControllers.bubbleControllers.ifPresent(controllers -> { - // Show the bubble bar when on launcher home or in overview. - boolean onHome = isInLauncher && mLauncherState == LauncherState.NORMAL; - boolean onOverview = mLauncherState == LauncherState.OVERVIEW; - controllers.bubbleStashController.setBubblesShowingOnHome(onHome); - controllers.bubbleStashController.setBubblesShowingOnOverview(onOverview); - }); - AnimatorSet animatorSet = new AnimatorSet(); if (hasAnyFlag(changedFlags, FLAG_LAUNCHER_IN_STATE_TRANSITION)) { @@ -483,7 +475,7 @@ public class TaskbarLauncherStateController { TaskbarStashController stashController = mControllers.taskbarStashController; stashController.updateAndAnimateTransientTaskbar( - /* stash */ true, /* duration */ 0, true /* bubblesShouldFollow */); + /* stash */ true, /* duration */ 0); } }); } else { diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarScrimViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarScrimViewController.java index 1c250bf377..5ea00cf408 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarScrimViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarScrimViewController.java @@ -15,7 +15,6 @@ */ package com.android.launcher3.taskbar; -import static com.android.launcher3.taskbar.bubbles.BubbleBarController.BUBBLE_BAR_ENABLED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED; @@ -24,7 +23,6 @@ import android.view.animation.Interpolator; import android.view.animation.PathInterpolator; import com.android.launcher3.anim.AnimatedFloat; -import com.android.launcher3.util.DisplayController; import com.android.quickstep.SystemUiProxy; import java.io.PrintWriter; @@ -65,10 +63,6 @@ public class TaskbarScrimViewController implements TaskbarControllers.LoggableTa * Updates the scrim state based on the flags. */ public void updateStateForSysuiFlags(int stateFlags, boolean skipAnim) { - if (BUBBLE_BAR_ENABLED && DisplayController.isTransientTaskbar(mActivity)) { - // These scrims aren't used if bubble bar & transient taskbar are active. - return; - } final boolean bubblesExpanded = (stateFlags & SYSUI_STATE_BUBBLES_EXPANDED) != 0; final boolean manageMenuExpanded = (stateFlags & SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED) != 0; diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 0dd8310aa7..c2175f2444 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -255,15 +255,14 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba private boolean mEnableBlockingTimeoutDuringTests = false; // Evaluate whether the handle should be stashed - private final IntPredicate mIsStashedPredicate = flags -> { - boolean inApp = hasAnyFlag(flags, FLAGS_IN_APP); - boolean stashedInApp = hasAnyFlag(flags, FLAGS_STASHED_IN_APP); - boolean stashedLauncherState = hasAnyFlag(flags, FLAG_IN_STASHED_LAUNCHER_STATE); - boolean forceStashed = hasAnyFlag(flags, FLAGS_FORCE_STASHED); - return (inApp && stashedInApp) || (!inApp && stashedLauncherState) || forceStashed; - }; private final StatePropertyHolder mStatePropertyHolder = new StatePropertyHolder( - mIsStashedPredicate); + flags -> { + boolean inApp = hasAnyFlag(flags, FLAGS_IN_APP); + boolean stashedInApp = hasAnyFlag(flags, FLAGS_STASHED_IN_APP); + boolean stashedLauncherState = hasAnyFlag(flags, FLAG_IN_STASHED_LAUNCHER_STATE); + boolean forceStashed = hasAnyFlag(flags, FLAGS_FORCE_STASHED); + return (inApp && stashedInApp) || (!inApp && stashedLauncherState) || forceStashed; + }); private boolean mIsTaskbarSystemActionRegistered = false; private TaskbarSharedState mTaskbarSharedState; @@ -503,29 +502,15 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba /** * Stash or unstashes the transient taskbar, using the default TASKBAR_STASH_DURATION. - * If bubble bar exists, it will match taskbars stashing behavior. */ public void updateAndAnimateTransientTaskbar(boolean stash) { - updateAndAnimateTransientTaskbar(stash, TASKBAR_STASH_DURATION, - /* shouldBubblesFollow= */ true); - } - - /** - * Stash or unstashes the transient taskbar, using the default TASKBAR_STASH_DURATION. - * If bubble bar exists, it will match taskbars stashing behavior. - */ - public void updateAndAnimateTransientTaskbar(boolean stash, boolean shouldBubblesFollow) { - updateAndAnimateTransientTaskbar(stash, TASKBAR_STASH_DURATION, shouldBubblesFollow); + updateAndAnimateTransientTaskbar(stash, TASKBAR_STASH_DURATION); } /** * Stash or unstashes the transient taskbar. - * @param stash whether transient taskbar should be stashed. - * @param duration how long the duration of the stash should take. - * @param shouldBubblesFollow whether bubbles should match taskbars behavior. */ - public void updateAndAnimateTransientTaskbar(boolean stash, long duration, - boolean shouldBubblesFollow) { + public void updateAndAnimateTransientTaskbar(boolean stash, long duration) { if (!DisplayController.isTransientTaskbar(mActivity)) { return; } @@ -541,34 +526,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba updateStateForFlag(FLAG_STASHED_IN_APP_AUTO, stash); applyState(); } - - mControllers.bubbleControllers.ifPresent(controllers -> { - if (shouldBubblesFollow) { - final boolean willStash = mIsStashedPredicate.test(mState); - if (willStash != controllers.bubbleStashController.isStashed()) { - // Typically bubbles gets stashed / unstashed along with Taskbar, however, if - // taskbar is becoming stashed because bubbles is being expanded, we don't want - // to stash bubbles. - if (willStash) { - controllers.bubbleStashController.stashBubbleBar(); - } else { - controllers.bubbleStashController.showBubbleBar(false /* expandBubbles */); - } - } - } - }); - } - - /** - * Stashes transient taskbar after it has timed out. - */ - private void updateAndAnimateTransientTaskbarForTimeout() { - // If bubbles are expanded we shouldn't stash them when taskbar is hidden - // for the timeout. - boolean bubbleBarExpanded = mControllers.bubbleControllers.isPresent() - && mControllers.bubbleControllers.get().bubbleBarViewController.isExpanded(); - updateAndAnimateTransientTaskbar(/* stash= */ true, - /* shouldBubblesFollow= */ !bubbleBarExpanded); } /** @@ -923,7 +880,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba private void onIsStashedChanged(boolean isStashed) { mControllers.runAfterInit(() -> { mControllers.stashedHandleViewController.onIsStashedChanged(isStashed); - mControllers.taskbarInsetsController.onTaskbarOrBubblebarWindowHeightOrInsetsChanged(); + mControllers.taskbarInsetsController.onTaskbarWindowHeightOrInsetsChanged(); }); } @@ -1170,7 +1127,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba if (mControllers.taskbarAutohideSuspendController.isSuspended()) { return; } - updateAndAnimateTransientTaskbarForTimeout(); + updateAndAnimateTransientTaskbar(true); } @Override diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashViaTouchController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashViaTouchController.kt index b194c8e6b2..1cc667211c 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashViaTouchController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashViaTouchController.kt @@ -108,18 +108,7 @@ class TaskbarStashViaTouchController(val controllers: TaskbarControllers) : Touc } override fun onControllerInterceptTouchEvent(ev: MotionEvent): Boolean { - val bubbleControllers = controllers.bubbleControllers.orElse(null) - if (!enabled || bubbleControllers == null) { - return false - } - if (bubbleControllers.bubbleBarViewController.isExpanded) { - // WMShell / bubbles will handle collapsing - return false - } - if ( - controllers.taskbarStashController.isStashed && - bubbleControllers.bubbleStashController.isStashed - ) { + if (!enabled || controllers.taskbarStashController.isStashed) { return false } @@ -133,12 +122,7 @@ class TaskbarStashViaTouchController(val controllers: TaskbarControllers) : Touc return true } } else if (ev.action == MotionEvent.ACTION_DOWN) { - val isDownOnBubbleBar = - (bubbleControllers != null && - bubbleControllers.bubbleBarViewController.isEventOverAnyItem( - screenCoordinatesEv - )) - if (!isDownOnBubbleBar && screenCoordinatesEv.y < gestureHeightYThreshold) { + if (screenCoordinatesEv.y < gestureHeightYThreshold) { controllers.taskbarStashController.updateAndAnimateTransientTaskbar(true) } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java index 2456f4b5ae..065d1117c8 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java @@ -92,10 +92,6 @@ public class TaskbarTranslationController implements TaskbarControllers.Loggable mControllers.stashedHandleViewController.setTranslationYForSwipe(transY); mControllers.taskbarViewController.setTranslationYForSwipe(transY); mControllers.taskbarDragLayerController.setTranslationYForSwipe(transY); - mControllers.bubbleControllers.ifPresent(controllers -> { - controllers.bubbleBarViewController.setTranslationYForSwipe(transY); - controllers.bubbleStashedHandleViewController.setTranslationYForSwipe(transY); - }); } /** diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java index 37861896e0..82494c6fda 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java @@ -28,8 +28,6 @@ import com.android.launcher3.R; import com.android.launcher3.anim.AnimatedFloat; import com.android.launcher3.taskbar.TaskbarActivityContext; import com.android.launcher3.taskbar.TaskbarControllers; -import com.android.launcher3.taskbar.TaskbarInsetsController; -import com.android.launcher3.taskbar.TaskbarStashController; import com.android.launcher3.util.MultiPropertyFactory; import com.android.launcher3.util.MultiValueAlpha; import com.android.quickstep.SystemUiProxy; @@ -53,8 +51,6 @@ public class BubbleBarViewController { // Initialized in init. private BubbleStashController mBubbleStashController; private BubbleBarController mBubbleBarController; - private TaskbarStashController mTaskbarStashController; - private TaskbarInsetsController mTaskbarInsetsController; private View.OnClickListener mBubbleClickListener; private View.OnClickListener mBubbleBarClickListener; @@ -84,8 +80,6 @@ public class BubbleBarViewController { public void init(TaskbarControllers controllers, BubbleControllers bubbleControllers) { mBubbleStashController = bubbleControllers.bubbleStashController; mBubbleBarController = bubbleControllers.bubbleBarController; - mTaskbarStashController = controllers.taskbarStashController; - mTaskbarInsetsController = controllers.taskbarInsetsController; mActivity.addOnDeviceProfileChangeListener(dp -> mBarView.getLayoutParams().height = mActivity.getDeviceProfile().taskbarHeight @@ -95,9 +89,7 @@ public class BubbleBarViewController { mBubbleClickListener = v -> onBubbleClicked(v); mBubbleBarClickListener = v -> setExpanded(true); mBarView.setOnClickListener(mBubbleBarClickListener); - mBarView.addOnLayoutChangeListener((view, i, i1, i2, i3, i4, i5, i6, i7) -> - mTaskbarInsetsController.onTaskbarOrBubblebarWindowHeightOrInsetsChanged() - ); + // TODO: when barView layout changes tell taskbarInsetsController the insets have changed. } private void onBubbleClicked(View v) { @@ -291,8 +283,7 @@ public class BubbleBarViewController { } else { Log.w(TAG, "trying to expand bubbles when there isn't one selected"); } - mTaskbarStashController.updateAndAnimateTransientTaskbar(true /* stash */, - false /* shouldBubblesFollow */); + // TODO: Tell taskbar stash controller to stash without bubbles following } } } diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java index b3c7d41e37..0ab53b0c20 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java @@ -25,7 +25,6 @@ import com.android.launcher3.anim.AnimatedFloat; import com.android.launcher3.taskbar.StashedHandleViewController; import com.android.launcher3.taskbar.TaskbarActivityContext; import com.android.launcher3.taskbar.TaskbarControllers; -import com.android.launcher3.taskbar.TaskbarInsetsController; import com.android.launcher3.taskbar.TaskbarStashController; import com.android.launcher3.util.MultiPropertyFactory; @@ -51,7 +50,6 @@ public class BubbleStashController { // Initialized in init. private TaskbarControllers mControllers; - private TaskbarInsetsController mTaskbarInsetsController; private BubbleBarViewController mBarViewController; private BubbleStashedHandleViewController mHandleViewController; private TaskbarStashController mTaskbarStashController; @@ -79,7 +77,6 @@ public class BubbleStashController { public void init(TaskbarControllers controllers, BubbleControllers bubbleControllers) { mControllers = controllers; - mTaskbarInsetsController = controllers.taskbarInsetsController; mBarViewController = bubbleControllers.bubbleBarViewController; mHandleViewController = bubbleControllers.bubbleStashedHandleViewController; mTaskbarStashController = controllers.taskbarStashController; @@ -274,7 +271,7 @@ public class BubbleStashController { private void onIsStashedChanged() { mControllers.runAfterInit(() -> { mHandleViewController.onIsStashedChanged(); - mTaskbarInsetsController.onTaskbarOrBubblebarWindowHeightOrInsetsChanged(); + // TODO: when stash changes tell taskbarInsetsController the insets have changed. }); } } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java index b9126ebdfc..65c825c0f6 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java @@ -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) {