From 6abdd5c73531c0bd145613a33fbdd0d653a5bddc Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 16 Nov 2022 13:57:28 -0800 Subject: [PATCH] Removing unnecessary event dispatching via touch-controller. Instead using a poll method similar to other touch controllers Bug: 259447608 Test: Verified on device Change-Id: I5c29c7c1b87acb668ea93e9f44fb685379de54fb --- .../NoButtonNavbarToOverviewTouchController.java | 16 ++++++---------- .../android/quickstep/BaseActivityInterface.java | 3 --- .../quickstep/FallbackActivityInterface.java | 5 ----- .../quickstep/LauncherActivityInterface.java | 9 --------- .../quickstep/OverviewComponentObserver.java | 5 ----- src/com/android/launcher3/Launcher.java | 8 -------- .../android/launcher3/dragndrop/DragLayer.java | 11 ----------- .../android/launcher3/util/TouchController.java | 5 ----- 8 files changed, 6 insertions(+), 56 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java index 918b3c1bf8..f343f525b5 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java @@ -26,6 +26,7 @@ import static com.android.launcher3.Utilities.EDGE_NAV_BAR; import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback; import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL; import static com.android.quickstep.util.VibratorWrapper.OVERVIEW_HAPTIC; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ONE_HANDED_ACTIVE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED; import android.animation.ObjectAnimator; @@ -86,6 +87,11 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch @Override protected boolean canInterceptTouch(MotionEvent ev) { mDidTouchStartInNavBar = (ev.getEdgeFlags() & EDGE_NAV_BAR) != 0; + boolean isOneHandedModeActive = (SystemUiProxy.INSTANCE.get(mLauncher) + .getLastSystemUiStateFlags() & SYSUI_STATE_ONE_HANDED_ACTIVE) != 0; + // Reset touch slop multiplier to default 1.0f if one-handed-mode is not active + mDetector.setTouchSlopMultiplier( + isOneHandedModeActive ? ONE_HANDED_ACTIVATED_SLOP_MULTIPLIER : 1f /* default */); return super.canInterceptTouch(ev) && !mLauncher.isInState(HINT_STATE); } @@ -277,14 +283,4 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch private float dpiFromPx(float pixels) { return Utilities.dpiFromPx(pixels, mLauncher.getResources().getDisplayMetrics().densityDpi); } - - @Override - public void onOneHandedModeStateChanged(boolean activated) { - if (activated) { - mDetector.setTouchSlopMultiplier(ONE_HANDED_ACTIVATED_SLOP_MULTIPLIER); - } else { - // Reset touch slop multiplier to default 1.0f - mDetector.setTouchSlopMultiplier(1f /* default */); - } - } } diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java index a62232620d..2c3ba85136 100644 --- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java +++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java @@ -121,9 +121,6 @@ public abstract class BaseActivityInterface callback); diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java index c62220f54b..ae9fb0b385 100644 --- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java +++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java @@ -77,11 +77,6 @@ public final class FallbackActivityInterface extends // set to zero prior to this class becoming active. } - @Override - public void onOneHandedModeStateChanged(boolean activated) { - // Do nothing for FallbackActivityInterface - } - /** 6 */ @Override public AnimationFactory prepareRecentsUI(RecentsAnimationDeviceState deviceState, diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java index ecb37474e6..9ff941671b 100644 --- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java +++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java @@ -108,15 +108,6 @@ public final class LauncherActivityInterface extends launcher.onAssistantVisibilityChanged(visibility); } - @Override - public void onOneHandedModeStateChanged(boolean activated) { - Launcher launcher = getCreatedActivity(); - if (launcher == null) { - return; - } - launcher.onOneHandedStateChanged(activated); - } - @Override public AnimationFactory prepareRecentsUI(RecentsAnimationDeviceState deviceState, boolean activityVisible, Consumer callback) { diff --git a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java index 9e3173c1f0..8e07376b14 100644 --- a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java +++ b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java @@ -115,11 +115,6 @@ public final class OverviewComponentObserver { if (mDeviceState.isHomeDisabled() != mIsHomeDisabled) { updateOverviewTargets(); } - - // Notify ALL_APPS touch controller when one handed mode state activated or deactivated - if (mDeviceState.isOneHandedModeEnabled()) { - mActivityInterface.onOneHandedModeStateChanged(mDeviceState.isOneHandedModeActive()); - } } private void updateOverviewTargets(Intent unused) { diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index ab7f6226c9..8453f2c1dc 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -647,14 +647,6 @@ public class Launcher extends StatefulActivity mHotseat.getQsb().setAlpha(1f - visibility); } - /** - * Called when one handed mode activated and deactivated. - * @param activated true if one handed mode activated, false otherwise. - */ - public void onOneHandedStateChanged(boolean activated) { - mDragLayer.onOneHandedModeStateChanged(activated); - } - /** * Returns {@code true} if a new DeviceProfile is initialized, and {@code false} otherwise. */ diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index 1ee7fc1fa3..366870b4c2 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -56,7 +56,6 @@ import com.android.launcher3.celllayout.CellLayoutLayoutParams; import com.android.launcher3.folder.Folder; import com.android.launcher3.graphics.Scrim; import com.android.launcher3.keyboard.ViewGroupFocusHelper; -import com.android.launcher3.util.TouchController; import com.android.launcher3.views.BaseDragLayer; import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlayCallbacks; @@ -474,16 +473,6 @@ public class DragLayer extends BaseDragLayer implements LauncherOverla return mWorkspaceDragScrim; } - /** - * Called when one handed mode state changed. - * @param activated true if one handed mode activated, false otherwise. - */ - public void onOneHandedModeStateChanged(boolean activated) { - for (TouchController controller : mControllers) { - controller.onOneHandedModeStateChanged(activated); - } - } - @Override public void onOverlayScrollChanged(float progress) { float alpha = 1 - Interpolators.DEACCEL_3.getInterpolation(progress); diff --git a/src/com/android/launcher3/util/TouchController.java b/src/com/android/launcher3/util/TouchController.java index 9c397c0f74..fc1d819f78 100644 --- a/src/com/android/launcher3/util/TouchController.java +++ b/src/com/android/launcher3/util/TouchController.java @@ -32,10 +32,5 @@ public interface TouchController { */ boolean onControllerInterceptTouchEvent(MotionEvent ev); - /** - * Called when one handed mode state changed - */ - default void onOneHandedModeStateChanged(boolean activated) { } - default void dump(String prefix, PrintWriter writer) { } }