aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 08:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename AssistUtilsBase -> AssistUtils am: b2ac210120

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24555400

Change-Id: Idde965260aef41cd3fe662557051ccc92418e8c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andy Wickham
2023-08-25 21:49:54 +00:00
committed by Automerger Merge Worker
parent 7a027090fc b2ac210120
commit a8c9d7161f
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java
View File

@@ -51,7 +51,7 @@ import com.android.quickstep.OverviewCommandHelper;
import com.android.quickstep.SystemUiProxy;
import com.android.quickstep.TaskUtils;
import com.android.quickstep.TouchInteractionService;
import com.android.quickstep.util.AssistUtilsBase;
import com.android.quickstep.util.AssistUtils;
import com.android.quickstep.views.DesktopTaskView;
import java.io.PrintWriter;
@@ -313,7 +313,7 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa
return;
}
// Attempt to start Assist with AssistUtils, otherwise fall back to SysUi's implementation.
if (!AssistUtilsBase.newInstance(mService.getApplicationContext()).tryStartAssistOverride(
if (!AssistUtils.newInstance(mService.getApplicationContext()).tryStartAssistOverride(
INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS)) {
Bundle args = new Bundle();
args.putInt(INVOCATION_TYPE_KEY, INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS);

4
quickstep/src/com/android/quickstep/SystemUiProxy.java
View File

@@ -62,7 +62,7 @@ import com.android.internal.view.AppearanceRegion;
import com.android.launcher3.util.MainThreadInitializedObject;
import com.android.launcher3.util.Preconditions;
import com.android.launcher3.util.SplitConfigurationOptions;
import com.android.quickstep.util.AssistUtilsBase;
import com.android.quickstep.util.AssistUtils;
import com.android.systemui.shared.recents.ISystemUiProxy;
import com.android.systemui.shared.recents.model.ThumbnailData;
import com.android.systemui.shared.system.RecentsAnimationControllerCompat;
@@ -252,7 +252,7 @@ public class SystemUiProxy implements ISystemUiProxy {
setUnfoldAnimationListener(mUnfoldAnimationListener);
setDesktopTaskListener(mDesktopTaskListener);
setAssistantOverridesRequested(
AssistUtilsBase.newInstance(mContext).getSysUiAssistOverrideInvocationTypes());
AssistUtils.newInstance(mContext).getSysUiAssistOverrideInvocationTypes());
}
/**

4
quickstep/src/com/android/quickstep/TouchInteractionService.java
View File

@@ -117,7 +117,7 @@ import com.android.quickstep.inputconsumers.TaskbarUnstashInputConsumer;
import com.android.quickstep.inputconsumers.TrackpadStatusBarInputConsumer;
import com.android.quickstep.util.ActiveGestureLog;
import com.android.quickstep.util.ActiveGestureLog.CompoundString;
import com.android.quickstep.util.AssistUtilsBase;
import com.android.quickstep.util.AssistUtils;
import com.android.systemui.shared.recents.IOverviewProxy;
import com.android.systemui.shared.recents.ISystemUiProxy;
import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -289,7 +289,7 @@ public class TouchInteractionService extends Service {
@Override
public void onAssistantOverrideInvoked(int invocationType) {
executeForTouchInteractionService(tis -> {
if (!AssistUtilsBase.newInstance(tis).tryStartAssistOverride(invocationType)) {
if (!AssistUtils.newInstance(tis).tryStartAssistOverride(invocationType)) {
Log.w(TAG, "Failed to invoke Assist override");
}
});

8
quickstep/src/com/android/quickstep/util/AssistUtilsBase.java → quickstep/src/com/android/quickstep/util/AssistUtils.java
View File

@@ -21,13 +21,13 @@ import com.android.launcher3.R;
import com.android.launcher3.util.ResourceBasedOverride;
/** Utilities to work with Assistant functionality. */
public class AssistUtilsBase implements ResourceBasedOverride {
public class AssistUtils implements ResourceBasedOverride {
public AssistUtilsBase() {}
public AssistUtils() {}
/** Creates AssistUtils as specified by overrides */
public static AssistUtilsBase newInstance(Context context) {
return Overrides.getObject(AssistUtilsBase.class, context, R.string.assist_utils_class);
public static AssistUtils newInstance(Context context) {
return Overrides.getObject(AssistUtils.class, context, R.string.assist_utils_class);
}
/** @return Array of AssistUtils.INVOCATION_TYPE_* that we want to handle instead of SysUI. */