Move LauncherClient to google package

saulhdev · saulhdev · commit 29c025158949 · 2026-02-08T16:05:18.000-06:00
Signed-off-by: Saul Henriquez &lt;saul_henriquez@hotmail.com&gt;
diff --git a/Omega/src/com/google/android/libraries/launcherclient/BaseClientService.kt b/Omega/src/com/google/android/libraries/launcherclient/BaseClientService.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.neoapps.launcherclient
+package com.google.android.libraries.launcherclient
 
 import android.content.ComponentName
 import android.content.Context
diff --git a/Omega/src/com/google/android/libraries/launcherclient/IScrollCallback.kt b/Omega/src/com/google/android/libraries/launcherclient/IScrollCallback.kt
@@ -1,4 +1,4 @@
-package com.neoapps.launcherclient
+package com.google.android.libraries.launcherclient
 
 interface IScrollCallback {
     fun onOverlayScrollChanged(progress: Float)
diff --git a/Omega/src/com/google/android/libraries/launcherclient/ISerializableScrollCallback.kt b/Omega/src/com/google/android/libraries/launcherclient/ISerializableScrollCallback.kt
@@ -1,4 +1,4 @@
-package com.neoapps.launcherclient
+package com.google.android.libraries.launcherclient
 
 interface ISerializableScrollCallback : IScrollCallback {
     fun setPersistentFlags(myFlags: Int)
diff --git a/Omega/src/com/google/android/libraries/launcherclient/LauncherClient.java b/Omega/src/com/google/android/libraries/launcherclient/LauncherClient.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.neoapps.launcherclient;
+package com.google.android.libraries.launcherclient;
 
 import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
 
@@ -41,8 +41,7 @@
 import android.view.WindowManager;
 import android.view.WindowManager.LayoutParams;
 
-import com.google.android.libraries.launcherclient.ILauncherOverlay;
-import com.google.android.libraries.launcherclient.ILauncherOverlayCallback;
+import com.android.launcher3.qsb.OSEManager;
 import com.neoapps.neolauncher.preferences.NeoPrefs;
 
 import java.lang.ref.WeakReference;
@@ -63,7 +62,7 @@ public void onReceive(Context context, Intent intent) {
             mLauncherService.disconnect();
             LauncherClient.loadApiVersion(context);
             if ((mActivityState & 2) != 0) {
-                reconnect();
+                connect();
             }
         }
     };
@@ -79,9 +78,6 @@ public void onReceive(Context context, Intent intent) {
     public boolean mDestroyed = false;
     private Bundle mLayoutBundle;
 
-    private NeoPrefs prefs;
-    private String feedProvider = "";
-
     public class OverlayCallback extends ILauncherOverlayCallback.Stub implements Callback {
         public LauncherClient mClient;
         private final Handler mUIHandler = new Handler(Looper.getMainLooper(), this);
@@ -142,7 +138,6 @@ public boolean handleMessage(Message message) {
 
     public LauncherClient(Activity activity, IScrollCallback scrollCallback, StaticInteger flags) {
         mActivity = activity;
-        prefs = NeoPrefs.getInstance();
         mScrollCallback = scrollCallback;
         mBaseService = new BaseClientService(activity, Context.BIND_AUTO_CREATE | Context.BIND_IMPORTANT);
         mFlags = flags.mData;
@@ -160,14 +155,22 @@ public LauncherClient(Activity activity, IScrollCallback scrollCallback, StaticI
             loadApiVersion(activity);
         }
 
-        reconnect();
+        connect();
         if (mActivity.getWindow() != null &&
                 mActivity.getWindow().peekDecorView() != null &&
                 mActivity.getWindow().peekDecorView().isAttachedToWindow()) {
             onAttachedToWindow();
         }
     }
 
+    public void setEnableFeed(boolean enable) {
+        if (enable) {
+            mFlags |= 1;
+        } else {
+            mFlags &= ~1;
+        }
+    }
+
     public final void onAttachedToWindow() {
         if (!mDestroyed) {
             setLayoutParams(mActivity.getWindow().getAttributes());
@@ -215,7 +218,7 @@ public final void onPause() {
     public final void onStart() {
         if (!mDestroyed) {
             mLauncherService.setStopped(false);
-            reconnect();
+            connect();
             mActivityState |= 1;
             if (mOverlay != null && mLayoutParams != null) {
                 try {
@@ -252,12 +255,21 @@ public void onDestroy() {
         }
     }
 
-    private void reconnect() {
+    private void connect() {
         if (!mDestroyed && (!mLauncherService.connect() || !mBaseService.connect())) {
             mActivity.runOnUiThread(() -> setServiceState(0));
         }
     }
 
+    public void reconnect() {
+        mBaseService.disconnect();
+        mLauncherService.disconnect();
+        LauncherClient.loadApiVersion(mActivity);
+        if ((mActivityState & 2) != 0) {
+            connect();
+        }
+    }
+
     public final void setLayoutParams(LayoutParams layoutParams) {
         if (mLayoutParams != layoutParams) {
             mLayoutParams = layoutParams;
@@ -419,7 +431,7 @@ private void setServiceState(int serviceState) {
     static Intent getIntent(Context context, boolean proxy) {
         String pkg = context.getPackageName();
         NeoPrefs prefs = NeoPrefs.getInstance();
-        return new Intent("com.android.launcher3.WINDOW_OVERLAY")
+        return new Intent(OSEManager.OVERLAY_ACTION)
                 .setPackage(prefs.getFeedProvider().getValue())
                 .setData(Uri.parse("app://" +
                                 pkg +
diff --git a/Omega/src/com/google/android/libraries/launcherclient/LauncherClientBridge.java b/Omega/src/com/google/android/libraries/launcherclient/LauncherClientBridge.java
@@ -1,12 +1,10 @@
-package com.neoapps.launcherclient;
+package com.google.android.libraries.launcherclient;
 
 import android.content.ComponentName;
 import android.content.ServiceConnection;
 import android.os.IBinder;
 import android.os.RemoteException;
 
-import com.neoapps.launcherclient.BaseClientService;
-
 import amirz.aidlbridge.IBridge;
 import amirz.aidlbridge.IBridgeCallback;
 
diff --git a/Omega/src/com/google/android/libraries/launcherclient/LauncherClientCallbacks.kt b/Omega/src/com/google/android/libraries/launcherclient/LauncherClientCallbacks.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.neoapps.launcherclient
+package com.google.android.libraries.launcherclient
 
 interface LauncherClientCallbacks {
     fun onServiceStateChanged(overlayAttached: Boolean, hotwordActive: Boolean)
diff --git a/Omega/src/com/google/android/libraries/launcherclient/LauncherClientService.java b/Omega/src/com/google/android/libraries/launcherclient/LauncherClientService.java
@@ -1,13 +1,9 @@
-package com.neoapps.launcherclient;
+package com.google.android.libraries.launcherclient;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.os.IBinder;
 
-import com.google.android.libraries.launcherclient.ILauncherOverlay;
-import com.neoapps.launcherclient.BaseClientService;
-import com.neoapps.launcherclient.LauncherClient;
-
 import java.lang.ref.WeakReference;
 
 public class LauncherClientService extends BaseClientService {
diff --git a/Omega/src/com/google/android/libraries/launcherclient/StaticInteger.kt b/Omega/src/com/google/android/libraries/launcherclient/StaticInteger.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.neoapps.launcherclient
+package com.google.android.libraries.launcherclient
 
 class StaticInteger(data: Int) {
     @JvmField
diff --git a/Omega/src/com/neoapps/neolauncher/NeoLauncher.kt b/Omega/src/com/neoapps/neolauncher/NeoLauncher.kt
@@ -42,6 +42,7 @@ import androidx.activity.result.contract.ActivityResultContracts.StartActivityFo
 import androidx.activity.result.contract.ActivityResultContracts.StartIntentSenderForResult
 import androidx.core.app.ActivityCompat
 import androidx.core.app.ActivityOptionsCompat
+import androidx.lifecycle.lifecycleScope
 import androidx.savedstate.SavedStateRegistry
 import androidx.savedstate.SavedStateRegistryController
 import androidx.savedstate.SavedStateRegistryOwner
@@ -69,14 +70,19 @@ import com.neoapps.neolauncher.theme.ThemeOverride
 import com.neoapps.neolauncher.util.Config
 import com.neoapps.neolauncher.util.Permissions
 import com.neoapps.neolauncher.util.hasStoragePermission
+import com.neoapps.neolauncher.util.unsafeLazy
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
 import java.util.stream.Stream
 
 class NeoLauncher : Launcher(), SavedStateRegistryOwner,
     ActivityResultRegistryOwner, ThemeManager.ThemeableActivity {
+    private val defaultOverlay by unsafeLazy { OverlayCallbackImpl(this) }
     val prefs: NeoPrefs by inject()
     private val prefCallback = PreferencesChangeCallback(this)
     private var paused = false
@@ -126,6 +132,10 @@ class NeoLauncher : Launcher(), SavedStateRegistryOwner,
                 }
             }
         }, null)
+        prefs.feedProvider.get().distinctUntilChanged().onEach { provider ->
+            val enable = provider != ""
+            defaultOverlay.setEnableFeed(enable)
+        }.launchIn(scope = lifecycleScope)
 
         themeOverride = ThemeOverride(themeSet, this)
         themeOverride.applyTheme(this)
@@ -267,12 +277,7 @@ class NeoLauncher : Launcher(), SavedStateRegistryOwner,
         )
     }
 
-    override fun getDefaultOverlay(): LauncherOverlayManager {
-        if (mOverlayManager == null) {
-            mOverlayManager = OverlayCallbackImpl(this)
-        }
-        return mOverlayManager
-    }
+    override fun getDefaultOverlay(): LauncherOverlayManager = defaultOverlay
 
     override fun onUiChangedWhileSleeping() {
         if (Utilities.ATLEAST_S) {
diff --git a/Omega/src/com/neoapps/neolauncher/OverlayCallbackImpl.kt b/Omega/src/com/neoapps/neolauncher/OverlayCallbackImpl.kt
@@ -18,6 +18,7 @@
 
 package com.neoapps.neolauncher
 
+import android.util.Log
 import android.view.MotionEvent
 import androidx.core.content.edit
 import androidx.lifecycle.lifecycleScope
@@ -26,10 +27,10 @@ import com.android.launcher3.LauncherPrefs
 import com.android.systemui.plugins.shared.LauncherOverlayManager
 import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlayCallbacks
 import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlayTouchProxy
-import com.neoapps.launcherclient.IScrollCallback
-import com.neoapps.launcherclient.LauncherClient
-import com.neoapps.launcherclient.LauncherClientCallbacks
-import com.neoapps.launcherclient.StaticInteger
+import com.google.android.libraries.launcherclient.IScrollCallback
+import com.google.android.libraries.launcherclient.LauncherClient
+import com.google.android.libraries.launcherclient.LauncherClientCallbacks
+import com.google.android.libraries.launcherclient.StaticInteger
 import com.neoapps.neolauncher.preferences.NeoPrefs
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -55,6 +56,20 @@ class OverlayCallbackImpl(val launcher: Launcher) : LauncherOverlayTouchProxy,
         )
     }
 
+    fun reconnect() {
+        mClient?.reconnect()
+    }
+
+    fun setEnableFeed(enable: Boolean) {
+        feedEnabled = enable
+        mClient?.setEnableFeed(enable)
+        reconnect()
+    }
+
+    override fun onDeviceProvideChanged() {
+        mClient?.redraw()
+    }
+
     override fun onAttachedToWindow() {
         job = launcher.launcher.lifecycleScope.launch {
             prefs.feedProvider.get().collect {
@@ -78,6 +93,7 @@ class OverlayCallbackImpl(val launcher: Launcher) : LauncherOverlayTouchProxy,
 
 
     override fun openOverlay() {
+        Log.d("OverlayCallbackImpl", "openOverlay")
         mClient!!.showOverlay(true)
     }
 
@@ -98,10 +114,6 @@ class OverlayCallbackImpl(val launcher: Launcher) : LauncherOverlayTouchProxy,
 
     }
 
-    override fun setOverlayCallbacks(callbacks: LauncherOverlayCallbacks) {
-        mLauncherOverlayCallbacks = callbacks
-    }
-
     override fun onOverlayScrollChanged(progress: Float) {
         if (mLauncherOverlayCallbacks != null) {
             mLauncherOverlayCallbacks!!.onOverlayScrollChanged(progress)
@@ -123,6 +135,10 @@ class OverlayCallbackImpl(val launcher: Launcher) : LauncherOverlayTouchProxy,
         mClient?.onDestroy()
     }
 
+    override fun setOverlayCallbacks(callbacks: LauncherOverlayCallbacks) {
+        mLauncherOverlayCallbacks = callbacks
+    }
+
     override fun setPersistentFlags(myFlags: Int) {
         val newFlags = myFlags and (8 or 16)
         if (newFlags != mFlags) {
diff --git a/Omega/src/com/neoapps/neolauncher/compose/pages/preferences/SearchPrefsPage.kt b/Omega/src/com/neoapps/neolauncher/compose/pages/preferences/SearchPrefsPage.kt
@@ -18,7 +18,9 @@
 package com.neoapps.neolauncher.compose.pages.preferences
 
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.runtime.Composable
@@ -89,15 +91,15 @@ fun SearchPrefsPage() {
                         prefs = showPrefs,
                         onPrefDialog = onPrefDialog
                 )
-            }
+            }*/
             item {
                 PreferenceGroup(
                     stringResource(id = R.string.title_feed_provider),
                     prefs = feedPrefs,
                     onPrefDialog = onPrefDialog
                 )
                 Spacer(modifier = Modifier.height(8.dp))
-            }*/
+            }
         }
 
         if (openDialog.value) {
diff --git a/Omega/src/com/neoapps/neolauncher/util/OmegaUtils.kt b/Omega/src/com/neoapps/neolauncher/util/OmegaUtils.kt
@@ -386,4 +386,30 @@ fun getFolderPreviewAlpha(context: Context): Int {
 
 fun minSDK(sdk: Int): Boolean {
     return Build.VERSION.SDK_INT >= sdk
+}
+
+@Suppress("NOTHING_TO_INLINE")
+inline fun <T : Any> unsafeLazy(noinline initializer: () -> T): Lazy<T> =
+    lazy(LazyThreadSafetyMode.NONE, initializer)
+
+fun getSignatureHash(context: Context, packageName: String): Long? {
+    return try {
+        val packageInfo = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            context.packageManager.getPackageInfo(
+                packageName,
+                PackageManager.GET_SIGNING_CERTIFICATES
+            )
+        } else {
+            context.packageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES)
+        }
+
+        val signatures = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            packageInfo.signingInfo?.apkContentsSigners
+        } else {
+            packageInfo.signatures
+        }
+        signatures?.firstOrNull()?.hashCode()?.toLong()
+    } catch (_: PackageManager.NameNotFoundException) {
+        null
+    }
 }
diff --git a/Omega/src/com/neoapps/neolauncher/util/PrefUtils.kt b/Omega/src/com/neoapps/neolauncher/util/PrefUtils.kt
@@ -8,6 +8,7 @@ import android.graphics.drawable.Drawable
 import android.net.Uri
 import com.android.launcher3.BuildConfig
 import com.android.launcher3.R
+import com.android.launcher3.qsb.OSEManager
 import com.neoapps.neolauncher.groups.AppGroupsManager
 import com.neoapps.neolauncher.preferences.PREFS_LANGUAGE_DEFAULT_CODE
 import com.neoapps.neolauncher.preferences.PREFS_LANGUAGE_DEFAULT_NAME
@@ -103,7 +104,7 @@ val Context.drawerCategorizationOptions: Map<String, String>
 
 fun Context.availableFeedProviders(): List<ApplicationInfo> {
     val packageManager = packageManager
-    val intent = Intent("com.android.launcher3.WINDOW_OVERLAY")
+    val intent = Intent(OSEManager.OVERLAY_ACTION)
         .setData(Uri.parse("app://$packageName"))
     val feedList: MutableList<ApplicationInfo> = ArrayList()
     for (resolveInfo in packageManager.queryIntentServices(
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -253,6 +253,7 @@ dependencies {
     implementation(project(":smartspace"))
     implementation(project(":widgetpicker"))
     implementation(project(":wmshell"))
+    compileOnly(files("$FRAMEWORK_PREBUILTS_DIR/SystemUI-core-16.jar"))
     compileOnly(files("$FRAMEWORK_PREBUILTS_DIR/SystemUI-statsd-16.jar"))
     compileOnly(files("$FRAMEWORK_PREBUILTS_DIR/WindowManager-Shell-16.jar"))
 
diff --git a/prebuilt/libs/SystemUI-core-16.jar b/prebuilt/libs/SystemUI-core-16.jar

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.neoapps.launcherclient`
	`1`	`+package com.google.android.libraries.launcherclient`
`2`	`2`
`3`	`3`	`interface IScrollCallback {`
`4`	`4`	`fun onOverlayScrollChanged(progress: Float)`