Trebuchet: Fix Taskbar{Model,View}CallbacksFactory instantiation
Overrides.getObject() calls the constructor with context if the overlay
has a valid class, if empty it uses the constructor without args.
Considering this class is part of quickstep, we should support both
cases, since this is the fallback class anyway
Co-authored-by: Aaron Kling <webgeek1234@gmail.com>
Fixes: I016d4e4e6a096ca4f5bd65fcda1bf24a444459f4
Change-Id: Ic412a2a3efbe1d3f8b9c02a58635c2821eabd54d
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacksFactory.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacksFactory.kt
index eb03b4a..8531729 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacksFactory.kt
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacksFactory.kt
@@ -22,7 +22,10 @@
import com.android.launcher3.util.ResourceBasedOverride.Overrides
/** Creates [TaskbarModelCallbacks] instances. */
-open class TaskbarModelCallbacksFactory : ResourceBasedOverride {
+// We must have constructors with and without context for Overrides.getObject
+open class TaskbarModelCallbacksFactory @JvmOverloads constructor(
+ context: Context? = null
+) : ResourceBasedOverride {
open fun create(
activityContext: TaskbarActivityContext,
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacksFactory.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacksFactory.kt
index 17da533..e080697 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacksFactory.kt
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacksFactory.kt
@@ -26,7 +26,10 @@
import com.android.quickstep.util.ContextualSearchInvoker
/** Creates [TaskbarViewCallbacks] instances. */
-open class TaskbarViewCallbacksFactory : ResourceBasedOverride {
+// We must have constructors with and without context for Overrides.getObject
+open class TaskbarViewCallbacksFactory @JvmOverloads constructor(
+ context: Context? = null
+) : ResourceBasedOverride {
open fun create(
activity: TaskbarActivityContext,