diff --git a/app/build.gradle b/app/build.gradle
index 35201d85c5..d493877cc2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -389,6 +389,7 @@ dependencies {
implementation 'androidx.camera:camera-camera2:1.4.2'
implementation 'androidx.camera:camera-lifecycle:1.4.2'
implementation 'androidx.webkit:webkit:1.12.1'
+ implementation 'androidx.palette:palette:1.0.0'
implementation 'io.github.webrtc-sdk:android:125.6422.07'
implementation("com.google.mediapipe:tasks-vision:${trackingPack.MEDIAPIPE_VERSION}") {
exclude group: 'com.google.auto.value', module: 'auto-value'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0f3addcb7b..01d980059d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,6 +18,12 @@
+
+
+
+
+
+
diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
index 23171a6c17..b2f45bc4ed 100644
--- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
@@ -227,6 +227,11 @@ class FrontEndActivity : ComponentActivity() {
refreshWifiDiscovery()
}
}
+ private val dateReceiver = object : android.content.BroadcastReceiver() {
+ override fun onReceive(context: android.content.Context?, intent: Intent?) {
+ refreshAndroidApps()
+ }
+ }
private val mediaRefresh = Runnable {
refresh()
refreshAddedGames()
@@ -1594,6 +1599,7 @@ class FrontEndActivity : ComponentActivity() {
refreshHomeAppState()
}
},
+ onAppIconsChanged = { refreshAndroidApps() },
onAndroidApp = { app, displayId -> launchAndroidApp(app, displayId) },
onBackActionsInverted = { inverted ->
SessionPrefs.setBackActionsInverted(this, inverted)
@@ -1972,6 +1978,7 @@ class FrontEndActivity : ComponentActivity() {
override fun onStart() {
super.onStart()
registerReceiver(wifiLocationReceiver, android.content.IntentFilter(android.location.LocationManager.MODE_CHANGED_ACTION))
+ registerReceiver(dateReceiver, android.content.IntentFilter(Intent.ACTION_DATE_CHANGED))
registerReceiver(mediaReceiver, android.content.IntentFilter().apply {
for (action in listOf(Intent.ACTION_MEDIA_MOUNTED, Intent.ACTION_MEDIA_UNMOUNTED, Intent.ACTION_MEDIA_REMOVED,
Intent.ACTION_MEDIA_EJECT, Intent.ACTION_MEDIA_BAD_REMOVAL)) addAction(action)
@@ -2038,6 +2045,7 @@ class FrontEndActivity : ComponentActivity() {
override fun onStop() {
if (!homeChoiceOpen) HomeApp.releaseUnusedHomeEntry(this)
unregisterReceiver(wifiLocationReceiver)
+ unregisterReceiver(dateReceiver)
unregisterReceiver(mediaReceiver)
getSystemService(android.content.pm.LauncherApps::class.java).unregisterCallback(packageCallback)
HomeWidgets.stopListening(this)
diff --git a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt
index 9a724d9044..8d3c7dc54c 100644
--- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt
+++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt
@@ -41,7 +41,7 @@ object HomeApp {
val userSerial: Long = 0L,
) {
val component get() = ComponentName(packageName, className)
- val key get() = "$packageName/$className" + if (userSerial != 0L) "#$userSerial" else ""
+ val key get() = appKey(packageName, className, userSerial)
val work get() = userSerial != 0L
}
@@ -101,6 +101,9 @@ object HomeApp {
?: resolved.loadLabel(pm)?.toString()?.trim()?.takeIf { it.isNotEmpty() }
}
+ private fun appKey(packageName: String, className: String, userSerial: Long) =
+ "$packageName/$className" + if (userSerial != 0L) "#$userSerial" else ""
+
fun roleRequestIntent(context: Context): Intent? {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return null
val roles = context.getSystemService(RoleManager::class.java) ?: return null
@@ -116,13 +119,25 @@ object HomeApp {
val pm = context.packageManager
val own = Process.myUserHandle()
val iconPx = (ICON_DP * context.resources.displayMetrics.density).roundToInt()
+ val densityDpi = context.resources.displayMetrics.densityDpi
+ val pack = IconPack.active(context)
+ val appColors = IconPack.appColors(context)
+ HomeIcons.load(context)
+ val overrides = HomeIcons.overrides
val apps = users.userProfiles.flatMap { user ->
val serial = if (user == own) 0L else users.getSerialNumberForUser(user)
runCatching { launcher.getActivityList(null, user) }.getOrDefault(emptyList()).mapNotNull { info ->
val component = info.componentName
if (component.packageName == context.packageName && user == own) return@mapNotNull null
val label = info.label?.toString()?.trim().orEmpty().ifEmpty { component.packageName }
- val icon = runCatching { info.getBadgedIcon(0).toBitmap(iconPx, iconPx) }.getOrNull()
+ val icon = runCatching {
+ (overrides[appKey(component.packageName, component.className, serial)]
+ ?.let { IconPack.drawable(context, it.pack, it.drawable, densityDpi) }
+ ?: pack?.icon(component, densityDpi)
+ ?: pack?.plated(info.getIcon(0), iconPx, densityDpi, appColors))
+ ?.let { pm.getUserBadgedIcon(it, user) }
+ ?.toBitmap(iconPx, iconPx)
+ }.getOrNull() ?: runCatching { info.getBadgedIcon(0).toBitmap(iconPx, iconPx) }.getOrNull()
val app = info.applicationInfo
val updated = if (user == own) runCatching { pm.getPackageInfo(component.packageName, 0).lastUpdateTime }.getOrNull() else null
@Suppress("DEPRECATION")
diff --git a/app/src/main/java/com/droiddeck/launcher/HomeIcons.kt b/app/src/main/java/com/droiddeck/launcher/HomeIcons.kt
new file mode 100644
index 0000000000..d3a57be2b4
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/HomeIcons.kt
@@ -0,0 +1,46 @@
+package com.droiddeck.launcher
+
+import android.content.Context
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+
+object HomeIcons {
+ private const val PREFS = "home_launcher"
+ private const val KEY = "icon_overrides"
+ private const val SEPARATOR = '\t'
+
+ data class Choice(val pack: String, val drawable: String)
+
+ var overrides by mutableStateOf