Merge "Removing unnecessary baseContext usage in InputConsumerUtils" into main
diff --git a/quickstep/src/com/android/quickstep/InputConsumerUtils.kt b/quickstep/src/com/android/quickstep/InputConsumerUtils.kt
index bea3150..558178f 100644
--- a/quickstep/src/com/android/quickstep/InputConsumerUtils.kt
+++ b/quickstep/src/com/android/quickstep/InputConsumerUtils.kt
@@ -56,8 +56,7 @@
@JvmStatic
fun <S : BaseState<S>, T> newConsumer(
- baseContext: Context,
- tisContext: Context,
+ context: Context,
resetGestureInputConsumer: ResetGestureInputConsumer?,
overviewComponentObserver: OverviewComponentObserver,
deviceState: RecentsAnimationDeviceState,
@@ -77,7 +76,7 @@
val bubbleControllers = tac?.bubbleControllers
if (bubbleControllers != null && BubbleBarInputConsumer.isEventOnBubbles(tac, event)) {
val consumer: InputConsumer =
- BubbleBarInputConsumer(tisContext, bubbleControllers, inputMonitorCompat)
+ BubbleBarInputConsumer(context, bubbleControllers, inputMonitorCompat)
logInputConsumerSelectionReason(
consumer,
newCompoundString("event is on bubbles, creating new input consumer"),
@@ -88,7 +87,7 @@
if (progressProxy != null) {
val consumer: InputConsumer =
ProgressDelegateInputConsumer(
- tisContext,
+ context,
taskAnimationManager,
gestureState,
inputMonitorCompat,
@@ -109,7 +108,7 @@
if (gestureState.isTrackpadGesture) deviceState.canStartTrackpadGesture()
else deviceState.canStartSystemGesture()
- if (!get(tisContext).isUserUnlocked) {
+ if (!get(context).isUserUnlocked) {
val reasonString = newCompoundString("device locked")
val consumer =
if (canStartSystemGesture) {
@@ -117,7 +116,7 @@
// launched while device is locked even after exiting direct boot mode (e.g.
// camera).
createDeviceLockedInputConsumer(
- tisContext,
+ context,
resetGestureInputConsumer,
deviceState,
gestureState,
@@ -148,7 +147,7 @@
)
base =
newBaseConsumer<S, T>(
- tisContext,
+ context,
resetGestureInputConsumer,
overviewComponentObserver,
deviceState,
@@ -186,7 +185,7 @@
)
base =
tryCreateAssistantInputConsumer(
- tisContext,
+ context,
deviceState,
inputMonitorCompat,
base,
@@ -213,7 +212,7 @@
)
base =
TaskbarUnstashInputConsumer(
- tisContext,
+ context,
base,
inputMonitorCompat,
tac,
@@ -237,7 +236,7 @@
}
}
- val navHandle = tac?.navHandle ?: SystemUiProxy.INSTANCE[tisContext]
+ val navHandle = tac?.navHandle ?: SystemUiProxy.INSTANCE[context]
if (
canStartSystemGesture &&
!previousGestureState.isRecentsAnimationRunning &&
@@ -256,7 +255,7 @@
reasonString.append("using NavHandleLongPressInputConsumer")
base =
NavHandleLongPressInputConsumer(
- tisContext,
+ context,
base,
inputMonitorCompat,
deviceState,
@@ -286,7 +285,7 @@
"%ssystem dialog is showing, using SysUiOverlayInputConsumer",
SUBSTRING_PREFIX,
)
- base = SysUiOverlayInputConsumer(baseContext, deviceState, inputMonitorCompat)
+ base = SysUiOverlayInputConsumer(context, deviceState, inputMonitorCompat)
}
if (
@@ -300,7 +299,7 @@
"%sTrackpad 3-finger gesture, using TrackpadStatusBarInputConsumer",
SUBSTRING_PREFIX,
)
- base = TrackpadStatusBarInputConsumer(baseContext, base, inputMonitorCompat)
+ base = TrackpadStatusBarInputConsumer(context, base, inputMonitorCompat)
}
if (deviceState.isScreenPinningActive) {
@@ -312,7 +311,7 @@
)
// Note: we only allow accessibility to wrap this, and it replaces the previous
// base input consumer (which should be NO_OP anyway since topTaskLocked == true).
- base = ScreenPinnedInputConsumer(tisContext, gestureState)
+ base = ScreenPinnedInputConsumer(context, gestureState)
}
if (deviceState.canTriggerOneHandedAction(event)) {
@@ -323,7 +322,7 @@
reasonPrefix,
SUBSTRING_PREFIX,
)
- base = OneHandedModeInputConsumer(tisContext, deviceState, base, inputMonitorCompat)
+ base = OneHandedModeInputConsumer(context, deviceState, base, inputMonitorCompat)
}
if (deviceState.isAccessibilityMenuAvailable) {
@@ -335,7 +334,7 @@
)
base =
AccessibilityInputConsumer(
- tisContext,
+ context,
deviceState,
gestureState,
base,
@@ -362,7 +361,7 @@
reasonPrefix,
SUBSTRING_PREFIX,
)
- base = OneHandedModeInputConsumer(tisContext, deviceState, base, inputMonitorCompat)
+ base = OneHandedModeInputConsumer(context, deviceState, base, inputMonitorCompat)
}
}
logInputConsumerSelectionReason(base, reasonString)
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index f5cc518..cb5d289 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -933,7 +933,6 @@
mConsumer.onConsumerAboutToBeSwitched();
mGestureState = newGestureState;
mConsumer = newConsumer(
- getBaseContext(),
this,
mResetGestureInputConsumer,
mOverviewComponentObserver,
diff --git a/quickstep/tests/src/com/android/quickstep/InputConsumerUtilsTest.java b/quickstep/tests/src/com/android/quickstep/InputConsumerUtilsTest.java
index f522a2c..160c578 100644
--- a/quickstep/tests/src/com/android/quickstep/InputConsumerUtilsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/InputConsumerUtilsTest.java
@@ -478,7 +478,6 @@
MotionEvent event = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 0, 0, 0);
InputConsumer inputConsumer = newConsumer(
mContext,
- mContext,
mResetGestureInputConsumer,
mOverviewComponentObserver,
mDeviceState,