diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java index 395833ffea..26ab3d6c52 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java @@ -76,7 +76,7 @@ public class StatusBarTouchController implements TouchController { private void dispatchTouchEvent(MotionEvent ev) { if (mSystemUiProxy.isActive()) { mLastAction = ev.getActionMasked(); - mSystemUiProxy.onStatusBarMotionEvent(ev); + mSystemUiProxy.onStatusBarTouchEvent(ev); } } diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index 380aa69a1c..fbed8509c0 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -314,13 +314,24 @@ public class SystemUiProxy implements ISystemUiProxy { @MainThread @Override - public void onStatusBarMotionEvent(MotionEvent event) { + public void onStatusBarTouchEvent(MotionEvent event) { Preconditions.assertUIThread(); if (mSystemUiProxy != null) { try { - mSystemUiProxy.onStatusBarMotionEvent(event); + mSystemUiProxy.onStatusBarTouchEvent(event); } catch (RemoteException e) { - Log.w(TAG, "Failed call onStatusBarMotionEvent", e); + Log.w(TAG, "Failed call onStatusBarTouchEvent with arg: " + event, e); + } + } + } + + @Override + public void onStatusBarTrackpadEvent(MotionEvent event) { + if (mSystemUiProxy != null) { + try { + mSystemUiProxy.onStatusBarTrackpadEvent(event); + } catch (RemoteException e) { + Log.w(TAG, "Failed call onStatusBarTrackpadEvent with arg: " + event, e); } } } diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index bb679232a5..ec06f87e29 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -113,7 +113,7 @@ import com.android.quickstep.inputconsumers.OverviewWithoutFocusInputConsumer; import com.android.quickstep.inputconsumers.ProgressDelegateInputConsumer; import com.android.quickstep.inputconsumers.ResetGestureInputConsumer; import com.android.quickstep.inputconsumers.ScreenPinnedInputConsumer; -import com.android.quickstep.inputconsumers.StatusBarInputConsumer; +import com.android.quickstep.inputconsumers.TrackpadStatusBarInputConsumer; import com.android.quickstep.inputconsumers.SysUiOverlayInputConsumer; import com.android.quickstep.inputconsumers.TaskbarUnstashInputConsumer; import com.android.quickstep.util.ActiveGestureLog; @@ -909,8 +909,9 @@ public class TouchInteractionService extends Service && !previousGestureState.isRecentsAnimationRunning()) { reasonString = newCompoundString(reasonPrefix) .append(SUBSTRING_PREFIX) - .append("Trackpad 3-finger gesture, using StatusBarInputConsumer"); - base = new StatusBarInputConsumer(getBaseContext(), base, mInputMonitorCompat); + .append("Trackpad 3-finger gesture, using TrackpadStatusBarInputConsumer"); + base = new TrackpadStatusBarInputConsumer(getBaseContext(), base, + mInputMonitorCompat); } if (mDeviceState.isScreenPinningActive()) { diff --git a/quickstep/src/com/android/quickstep/inputconsumers/StatusBarInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/TrackpadStatusBarInputConsumer.java similarity index 92% rename from quickstep/src/com/android/quickstep/inputconsumers/StatusBarInputConsumer.java rename to quickstep/src/com/android/quickstep/inputconsumers/TrackpadStatusBarInputConsumer.java index 898aa8640d..7ff99828c5 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/StatusBarInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/TrackpadStatusBarInputConsumer.java @@ -27,15 +27,15 @@ import com.android.quickstep.InputConsumer; import com.android.quickstep.SystemUiProxy; import com.android.systemui.shared.system.InputMonitorCompat; -/** Allows the status bar to be pull down for notification shade */ -public class StatusBarInputConsumer extends DelegateInputConsumer { +/** Allows the status bar to be pull down for notification shade using the trackpad. */ +public class TrackpadStatusBarInputConsumer extends DelegateInputConsumer { private final SystemUiProxy mSystemUiProxy; private final float mTouchSlop; private final PointF mDown = new PointF(); private boolean mHasPassedTouchSlop; - public StatusBarInputConsumer(Context context, InputConsumer delegate, + public TrackpadStatusBarInputConsumer(Context context, InputConsumer delegate, InputMonitorCompat inputMonitor) { super(delegate, inputMonitor); @@ -79,7 +79,7 @@ public class StatusBarInputConsumer extends DelegateInputConsumer { private void dispatchTouchEvent(MotionEvent ev) { if (mSystemUiProxy.isActive()) { - mSystemUiProxy.onStatusBarMotionEvent(ev); + mSystemUiProxy.onStatusBarTrackpadEvent(ev); } } }