Rename LawnchairLauncherQuickstep to LawnchairLauncher

lawnchair/src/app/lawnchair/DefaultAppFilter.kt

@@ -17,7 +17,6 @@
 package app.lawnchair
 
 import android.content.ComponentName
-import android.os.UserHandle
 import androidx.annotation.Keep
 import com.android.launcher3.AppFilter
 import com.android.launcher3.BuildConfig
@@ -34,7 +33,7 @@ open class DefaultAppFilter : AppFilter() {
         // Actions Services
         ComponentName.unflattenFromString("com.google.android.as/com.google.android.apps.miphone.aiai.allapps.main.MainDummyActivity"),
         // Lawnchair
-        ComponentName(BuildConfig.APPLICATION_ID, LawnchairLauncherQuickstep::class.java.name),
+        ComponentName(BuildConfig.APPLICATION_ID, LawnchairLauncher::class.java.name),
     )
 
     override fun shouldShowApp(app: ComponentName) = !defaultHideList.contains(app)

lawnchair/src/app/lawnchair/LawnchairLauncher.kt

@@ -38,7 +38,7 @@ import com.android.launcher3.R
 import com.android.launcher3.uioverrides.QuickstepLauncher
 import com.android.systemui.plugins.shared.LauncherOverlayManager
 
-open class LawnchairLauncherQuickstep : QuickstepLauncher(), LifecycleOwner,
+open class LawnchairLauncher : QuickstepLauncher(), LifecycleOwner,
     SavedStateRegistryOwner, OnBackPressedDispatcherOwner {
 
     private val lifecycleRegistry = LifecycleRegistry(this)
@@ -130,10 +130,10 @@ open class LawnchairLauncherQuickstep : QuickstepLauncher(), LifecycleOwner,
     companion object {
         var sRestart = false
 
-        val instance get() = LauncherAppState.getInstanceNoCreate()?.launcher as? LawnchairLauncherQuickstep
+        val instance get() = LauncherAppState.getInstanceNoCreate()?.launcher as? LawnchairLauncher
     }
 }
 
-val Context.launcher: LawnchairLauncherQuickstep get() {
+val Context.launcher: LawnchairLauncher get() {
     return BaseActivity.fromContext(this)
 }

lawnchair/src/app/lawnchair/gestures/GestureController.kt

@@ -16,11 +16,11 @@
 
 package app.lawnchair.gestures
 
-import app.lawnchair.LawnchairLauncherQuickstep
+import app.lawnchair.LawnchairLauncher
 import app.lawnchair.gestures.handlers.SleepGestureHandler
 import app.lawnchair.util.preferences.PreferenceManager
 
-class GestureController(launcher: LawnchairLauncherQuickstep) {
+class GestureController(launcher: LawnchairLauncher) {
     private val prefs = PreferenceManager.getInstance(launcher)
     private val doubleTapHandler = SleepGestureHandler(launcher)
 

lawnchair/src/app/lawnchair/nexuslauncher/OverlayCallbackImpl.java

@@ -16,7 +16,7 @@ import com.google.android.libraries.launcherclient.LauncherClientCallbacks;
 import com.google.android.libraries.launcherclient.StaticInteger;
 
 import app.lawnchair.FeedBridge;
-import app.lawnchair.LawnchairLauncherQuickstep;
+import app.lawnchair.LawnchairLauncher;
 import app.lawnchair.util.preferences.PrefEntry;
 import app.lawnchair.util.preferences.PreferenceManager;
 
@@ -43,7 +43,7 @@ public class OverlayCallbackImpl
     boolean mFlagsChanged = false;
     private int mFlags;
 
-    public OverlayCallbackImpl(LawnchairLauncherQuickstep launcher) {
+    public OverlayCallbackImpl(LawnchairLauncher launcher) {
         PreferenceManager prefs = PreferenceManager.getInstance(launcher);
         PrefEntry<Boolean> minusOnePref = prefs.getMinusOneEnable();
 

lawnchair/src/app/lawnchair/util/preferences/PreferenceManager.kt

@@ -19,7 +19,7 @@ package app.lawnchair.util.preferences
 import android.content.Context
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
-import app.lawnchair.LawnchairLauncherQuickstep
+import app.lawnchair.LawnchairLauncher
 import app.lawnchair.nexuslauncher.OverlayCallbackImpl
 import com.android.launcher3.LauncherAppState
 import com.android.launcher3.states.RotationHelper
@@ -32,7 +32,7 @@ class PreferenceManager private constructor(context: Context) : BasePreferenceMa
         model.forceReload()
     }
     private val scheduleRestart = {
-        LawnchairLauncherQuickstep.instance?.scheduleRestart()
+        LawnchairLauncher.instance?.scheduleRestart()
         Unit
     }
 

lawnchair/src/app/lawnchair/views/ComposeFloatingView.kt

@@ -13,7 +13,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.integerResource
-import app.lawnchair.LawnchairLauncherQuickstep
+import app.lawnchair.LawnchairLauncher
 import app.lawnchair.launcher
 import app.lawnchair.ui.preferences.components.BottomSheet
 import app.lawnchair.ui.preferences.components.BottomSheetState
@@ -80,7 +80,7 @@ class ComposeFloatingView(context: Context) :
     }
 
     companion object {
-        fun show(launcher: LawnchairLauncherQuickstep, content: @Composable ComposeFloatingView.() -> Unit) {
+        fun show(launcher: LawnchairLauncher, content: @Composable ComposeFloatingView.() -> Unit) {
             val view = ComposeFloatingView(launcher)
             view.container.setContent {
                 LawnchairTheme {
@@ -104,7 +104,7 @@ fun scrimColor(): Color {
 }
 
 @OptIn(ExperimentalMaterialApi::class)
-fun LawnchairLauncherQuickstep.showBottomSheet(
+fun LawnchairLauncher.showBottomSheet(
     content: @Composable ColumnScope.(state: BottomSheetState) -> Unit
 ) {
     ComposeFloatingView.show(this) {

quickstep/AndroidManifest-launcher.xml

@@ -46,7 +46,7 @@
         attributes and intent filters the same
         -->
         <activity
-            android:name="app.lawnchair.LawnchairLauncherQuickstep"
+            android:name="app.lawnchair.LawnchairLauncher"
             android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
             android:stateNotNeeded="true"

src/com/android/launcher3/touch/WorkspaceTouchListener.java

@@ -46,7 +46,7 @@ import com.android.launcher3.testing.TestLogging;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.views.OptionsPopupView;
 
-import app.lawnchair.LawnchairLauncherQuickstep;
+import app.lawnchair.LawnchairLauncher;
 
 
 /**
@@ -194,7 +194,7 @@ public class WorkspaceTouchListener extends GestureDetector.SimpleOnGestureListe
     @Override
     public boolean onDoubleTap(MotionEvent event) {
         Context context = mWorkspace.getContext();
-        LawnchairLauncherQuickstep launcher = Launcher.fromContext(context);
+        LawnchairLauncher launcher = Launcher.fromContext(context);
         launcher.getGestureController().onDoubleTap();
         return true;
     }