Migrate Contextual Search code to AOSP
- Adds ContextualSearchInvoker - Adds ContextualSearchStateManager - Adds ContextualSearchHapticManager Example output from ContextualSearchStateManager in TouchInteractionService dump: https://paste.googleplex.com/5536017815961600 Bug: 353715553 Test: go/contextual-search-entrypoints-test-plan Flag: EXEMPT moving code from vendor to aosp Change-Id: I8253294d6be427e0fc29d6052994de0c03f05a3e
This commit is contained in:
1 parent
0e27df431a
commit
0b936727d6
24 files changed
+1223
-195
No files matched your search
@@ -51,7 +51,7 @@ import com.android.launcher3.testing.TestLogging;
|
||||
import com.android.launcher3.testing.shared.TestProtocol;
|
||||
import com.android.quickstep.SystemUiProxy;
|
||||
import com.android.quickstep.TaskUtils;
|
||||
import com.android.quickstep.util.AssistUtils;
|
||||
import com.android.quickstep.util.ContextualSearchInvoker;
|
||||
import com.android.systemui.contextualeducation.GestureType;
|
||||
import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags;
|
||||
|
||||
@@ -113,7 +113,7 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa
|
||||
private final SystemUiProxy mSystemUiProxy;
|
||||
private final ContextualEduStatsManager mContextualEduStatsManager;
|
||||
private final Handler mHandler;
|
||||
private final AssistUtils mAssistUtils;
|
||||
private final ContextualSearchInvoker mContextualSearchInvoker;
|
||||
@Nullable private StatsLogManager mStatsLogManager;
|
||||
|
||||
private final Runnable mResetLongPress = this::resetScreenUnpin;
|
||||
@@ -124,13 +124,13 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa
|
||||
SystemUiProxy systemUiProxy,
|
||||
ContextualEduStatsManager contextualEduStatsManager,
|
||||
Handler handler,
|
||||
AssistUtils assistUtils) {
|
||||
ContextualSearchInvoker contextualSearchInvoker) {
|
||||
mContext = context;
|
||||
mCallbacks = callbacks;
|
||||
mSystemUiProxy = systemUiProxy;
|
||||
mContextualEduStatsManager = contextualEduStatsManager;
|
||||
mHandler = handler;
|
||||
mAssistUtils = assistUtils;
|
||||
mContextualSearchInvoker = contextualSearchInvoker;
|
||||
}
|
||||
|
||||
public void onButtonClick(@TaskbarButton int buttonType, View view) {
|
||||
@@ -344,8 +344,9 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa
|
||||
if (mScreenPinned || !mAssistantLongPressEnabled) {
|
||||
return;
|
||||
}
|
||||
// Attempt to start Assist with AssistUtils, otherwise fall back to SysUi's implementation.
|
||||
if (!mAssistUtils.tryStartAssistOverride(INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS)) {
|
||||
// Attempt to start Contextual Search, otherwise fall back to SysUi's implementation.
|
||||
if (!mContextualSearchInvoker.tryStartAssistOverride(
|
||||
INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS)) {
|
||||
Bundle args = new Bundle();
|
||||
args.putInt(INVOCATION_TYPE_KEY, INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS);
|
||||
mSystemUiProxy.startAssistant(args);
|
||||
|
||||
Reference in new issue
Block a user