Moving various common executors to a single location (6fe3eec9) · Commits · e / os / BlissLauncher3

go/quickstep/src/com/android/quickstep/OverviewCommandHelper.java

+7 −10

Original line number	Diff line number	Diff line
		@@ -15,8 +15,8 @@
		*/
		package com.android.quickstep;

		import static com.android.systemui.shared.system.ActivityManagerWrapper
		.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
		import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
		import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;

		import android.annotation.TargetApi;
		import android.content.Context;
		@@ -25,7 +25,6 @@ import android.os.SystemClock;
		import android.view.ViewConfiguration;

		import com.android.launcher3.BaseDraggingActivity;
		import com.android.launcher3.MainThreadExecutor;
		import com.android.launcher3.logging.UserEventDispatcher;
		import com.android.launcher3.userevent.nano.LauncherLogProto;
		import com.android.quickstep.ActivityControlHelper.ActivityInitListener;
		@@ -43,7 +42,6 @@ public class OverviewCommandHelper {
		private final Context mContext;
		private final ActivityManagerWrapper mAM;
		private final RecentsModel mRecentsModel;
		private final MainThreadExecutor mMainThreadExecutor;
		private final OverviewComponentObserver mOverviewComponentObserver;

		private long mLastToggleTime;
		@@ -51,7 +49,6 @@ public class OverviewCommandHelper {
		public OverviewCommandHelper(Context context, OverviewComponentObserver observer) {
		mContext = context;
		mAM = ActivityManagerWrapper.getInstance();
		mMainThreadExecutor = new MainThreadExecutor();
		mRecentsModel = RecentsModel.INSTANCE.get(mContext);
		mOverviewComponentObserver = observer;
		}
		@@ -63,19 +60,19 @@ public class OverviewCommandHelper {
		}

		mAM.closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
		mMainThreadExecutor.execute(new RecentsActivityCommand<>());
		MAIN_EXECUTOR.execute(new RecentsActivityCommand<>());
		}

		public void onOverviewShown(boolean triggeredFromAltTab) {
		mMainThreadExecutor.execute(new ShowRecentsCommand());
		MAIN_EXECUTOR.execute(new ShowRecentsCommand());
		}

		public void onOverviewHidden() {
		mMainThreadExecutor.execute(new HideRecentsCommand());
		MAIN_EXECUTOR.execute(new HideRecentsCommand());
		}

		public void onTip(int actionType, int viewType) {
		mMainThreadExecutor.execute(() ->
		MAIN_EXECUTOR.execute(() ->
		UserEventDispatcher.newInstance(mContext).logActionTip(actionType, viewType));
		}

		@@ -161,7 +158,7 @@ public class OverviewCommandHelper {
		// Otherwise, start overview.
		mListener = mHelper.createActivityInitListener(provider::onActivityReady);
		mListener.registerAndStartActivity(mOverviewComponentObserver.getOverviewIntent(),
		provider, mContext, mMainThreadExecutor.getHandler(),
		provider, mContext, MAIN_EXECUTOR.getHandler(),
		provider.getRecentsLaunchDuration());
		}

go/quickstep/src/com/android/quickstep/TouchInteractionService.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -34,8 +34,6 @@ import android.view.MotionEvent;

		import com.android.launcher3.Utilities;
		import com.android.launcher3.compat.UserManagerCompat;
		import com.android.launcher3.util.LooperExecutor;
		import com.android.launcher3.util.UiThreadHelper;
		import com.android.systemui.shared.recents.IOverviewProxy;
		import com.android.systemui.shared.recents.ISystemUiProxy;

		@@ -139,9 +137,6 @@ public class TouchInteractionService extends Service {
		return sConnected;
		}

		public static final LooperExecutor BACKGROUND_EXECUTOR =
		new LooperExecutor(UiThreadHelper.getBackgroundLooper());

		private RecentsModel mRecentsModel;
		private OverviewComponentObserver mOverviewComponentObserver;
		private OverviewCommandHelper mOverviewCommandHelper;

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/DynamicItemCache.java

+8 −7

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@ package com.android.launcher3.appprediction;

		import static android.content.pm.PackageManager.MATCH_INSTANT;

		import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;

		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.ApplicationInfo;
		@@ -30,8 +32,12 @@ import android.os.Message;
		import android.util.ArrayMap;
		import android.util.Log;

		import androidx.annotation.MainThread;
		import androidx.annotation.Nullable;
		import androidx.annotation.UiThread;
		import androidx.annotation.WorkerThread;

		import com.android.launcher3.LauncherAppState;
		import com.android.launcher3.LauncherModel;
		import com.android.launcher3.WorkspaceItemInfo;
		import com.android.launcher3.icons.IconCache;
		import com.android.launcher3.icons.LauncherIcons;
		@@ -45,11 +51,6 @@ import java.util.HashMap;
		import java.util.List;
		import java.util.Map;

		import androidx.annotation.MainThread;
		import androidx.annotation.Nullable;
		import androidx.annotation.UiThread;
		import androidx.annotation.WorkerThread;

		/**
		* Utility class which loads and caches predicted items like instant apps and shortcuts, before
		* they can be displayed on the UI
		@@ -77,7 +78,7 @@ public class DynamicItemCache {

		public DynamicItemCache(Context context, Runnable onUpdateCallback) {
		mContext = context;
		mWorker = new Handler(LauncherModel.getWorkerLooper(), this::handleWorkerMessage);
		mWorker = new Handler(MODEL_EXECUTOR.getLooper(), this::handleWorkerMessage);
		mUiHandler = new Handler(Looper.getMainLooper(), this::handleUiMessage);
		mInstantAppResolver = InstantAppResolver.newInstance(context);
		mOnUpdateCallback = onUpdateCallback;

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionAppTracker.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -15,6 +15,9 @@
		*/
		package com.android.launcher3.appprediction;

		import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_GRID;
		import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;

		import android.annotation.TargetApi;
		import android.app.prediction.AppPredictionContext;
		import android.app.prediction.AppPredictionManager;
		@@ -38,9 +41,6 @@ import androidx.annotation.WorkerThread;
		import com.android.launcher3.InvariantDeviceProfile;
		import com.android.launcher3.appprediction.PredictionUiStateManager.Client;
		import com.android.launcher3.model.AppLaunchTracker;
		import com.android.launcher3.util.UiThreadHelper;

		import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_GRID;

		/**
		* Subclass of app tracker which publishes the data to the prediction engine and gets back results.
		@@ -65,7 +65,7 @@ public class PredictionAppTracker extends AppLaunchTracker {

		public PredictionAppTracker(Context context) {
		mContext = context;
		mMessageHandler = new Handler(UiThreadHelper.getBackgroundLooper(), this::handleMessage);
		mMessageHandler = new Handler(UI_HELPER_EXECUTOR.getLooper(), this::handleMessage);
		InvariantDeviceProfile.INSTANCE.get(mContext).addOnChangeListener(this::onIdpChanged);

		mMessageHandler.sendEmptyMessage(MSG_INIT);

quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java

+6 −7

Original line number	Diff line number	Diff line
		@@ -22,9 +22,9 @@ import static com.android.launcher3.Utilities.postAsyncCallback;
		import static com.android.launcher3.anim.Interpolators.ACCEL_1_5;
		import static com.android.launcher3.anim.Interpolators.DEACCEL;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
		import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
		import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
		import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
		import static com.android.quickstep.TouchInteractionService.BACKGROUND_EXECUTOR;
		import static com.android.quickstep.TouchInteractionService.MAIN_THREAD_EXECUTOR;
		import static com.android.quickstep.TouchInteractionService.TOUCH_INTERACTION_LOG;

		import android.animation.Animator;
		@@ -47,6 +47,8 @@ import android.view.View;
		import android.view.WindowManager;
		import android.view.animation.Interpolator;

		import androidx.annotation.UiThread;

		import com.android.launcher3.BaseDraggingActivity;
		import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.InvariantDeviceProfile;
		@@ -54,7 +56,6 @@ import com.android.launcher3.R;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.anim.AnimationSuccessListener;
		import com.android.launcher3.anim.AnimatorPlaybackController;
		import com.android.launcher3.anim.Interpolators;
		import com.android.launcher3.graphics.RotationMode;
		import com.android.launcher3.views.FloatingIconView;
		import com.android.quickstep.ActivityControlHelper.ActivityInitListener;
		@@ -75,8 +76,6 @@ import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;

		import java.util.function.Consumer;

		import androidx.annotation.UiThread;

		/**
		* Base class for swipe up handler with some utility methods
		*/
		@@ -126,7 +125,7 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten

		protected Runnable mGestureEndCallback;

		protected final Handler mMainThreadHandler = MAIN_THREAD_EXECUTOR.getHandler();
		protected final Handler mMainThreadHandler = MAIN_EXECUTOR.getHandler();
		protected MultiStateCallback mStateCallback;

		protected boolean mCanceled;
		@@ -174,7 +173,7 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten
		if (effect == null) {
		return;
		}
		BACKGROUND_EXECUTOR.execute(() -> mVibrator.vibrate(effect));
		UI_HELPER_EXECUTOR.execute(() -> mVibrator.vibrate(effect));
		}

		public Consumer<MotionEvent> getRecentsViewDispatcher(RotationMode rotationMode) {