Skip to content

Fix missing and stale Monet wallpaper colors #1347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pbzin wants to merge 2 commits into
base: 16.0
Choose a base branch
from
Open

Fix missing and stale Monet wallpaper colors #1347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89ab3e8
WallpaperManagerService: Recover missing static wallpaper colors
pbzin Aug 29, 2026
622fe68
SystemUI: Refresh clock colors after Monet changes
pbzin Aug 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/SystemUI/res/drawable/sb_date_bg9.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:top="0dp" android:bottom="0dp">
<shape android:shape="rectangle">
<solid android:color="?android:attr/colorAccent"/>
<solid android:color="@android:color/system_accent1_300"/>
<corners android:radius="28dp"/>
</shape>
</item>
Expand Down
6 changes: 6 additions & 0 deletions packages/SystemUI/src/com/android/systemui/clocks/ClockStyle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.content.res.Configuration
import android.graphics.Color
import android.graphics.Typeface
import android.os.Handler
Expand Down Expand Up @@ -165,6 +166,11 @@ class ClockStyle @JvmOverloads constructor(
callbacksRegistered = false
}

override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig)
updateClockView()
}

override fun onTuningChanged(key: String?, newValue: String?) {
when (key) {
CLOCK_STYLE_KEY -> {
Expand Down
28 changes: 26 additions & 2 deletions ...I/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/HomeStatusBarViewBinder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import androidx.lifecycle.repeatOnLifecycle
import com.android.app.animation.Interpolators
import com.android.systemui.crdroid.batterybar.BatteryBarController
import com.android.systemui.crdroid.logo.LogoImage
import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent.DisplayAware
import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent.PerDisplaySingleton
import com.android.systemui.lifecycle.repeatWhenAttached
import com.android.systemui.res.R
Expand All @@ -62,6 +63,7 @@ import com.android.systemui.statusbar.phone.ui.StatusBarIconController
import com.android.systemui.statusbar.pipeline.shared.ui.model.VisibilityModel
import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel
import com.android.systemui.statusbar.policy.Clock
import com.android.systemui.statusbar.policy.ConfigurationController
import javax.inject.Inject
import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.MutableStateFlow
Expand Down Expand Up @@ -98,7 +100,8 @@ interface HomeStatusBarViewBinder {
class HomeStatusBarViewBinderImpl
@Inject
constructor(
private val viewStoreFactory: ConnectedDisplaysStatusBarNotificationIconViewStore.Factory
private val viewStoreFactory: ConnectedDisplaysStatusBarNotificationIconViewStore.Factory,
@DisplayAware private val configurationController: ConfigurationController,
) : HomeStatusBarViewBinder {
private companion object {
private const val CLOCK_POSITION_RIGHT = 0
Expand All @@ -111,6 +114,7 @@ constructor(
val denyListed: Boolean,
val hideForHun: Boolean,
val chipStyle: Int,
val themeVersion: Int,
val position: Int,
val visibilityModel: VisibilityModel,
)
Expand Down Expand Up @@ -166,6 +170,7 @@ constructor(
denyListed = false,
hideForHun = false,
chipStyle = 0,
themeVersion = 0,
position = context.contentResolver.readClockPosition(),
visibilityModel = VisibilityModel(View.GONE, true),
)
Expand Down Expand Up @@ -247,7 +252,12 @@ constructor(
}
}

val urisToObserve = listOf(clockAutoHideUri, iconHideListUri, statusBarClockUri, statusBarClockChipUri)
val urisToObserve = listOf(
clockAutoHideUri,
iconHideListUri,
statusBarClockUri,
statusBarClockChipUri,
)
urisToObserve.forEach { uri ->
context.contentResolver.registerContentObserver(
uri,
Expand All @@ -258,11 +268,22 @@ constructor(
contentObserver.onChange(false, uri)
}

val configurationListener =
object : ConfigurationController.ConfigurationListener {
override fun onThemeChanged() {
clockState.update { current ->
current.copy(themeVersion = current.themeVersion + 1)
}
}
}
configurationController.addCallback(configurationListener)

// Ensure cleanup when lifecycle ends
val job = coroutineContext[Job]
job?.invokeOnCompletion {
runCatching {
context.contentResolver.unregisterContentObserver(contentObserver)
configurationController.removeCallback(configurationListener)
TaskStackChangeListeners.getInstance()
.unregisterTaskStackListener(taskStackListener)
}
Expand Down Expand Up @@ -465,6 +486,7 @@ constructor(
launch {
var lastChipStyle: Int? = null
var lastClockPosition: Int? = null
var lastThemeVersion: Int? = null

clockState.collect { state ->
// We only want to hide left clock for HUN
Expand Down Expand Up @@ -504,6 +526,7 @@ constructor(
// Only touch chip UI when needed
val chipNeedsUpdate = (lastChipStyle != state.chipStyle)
|| (lastClockPosition != state.position)
|| (lastThemeVersion != state.themeVersion)
if (chipNeedsUpdate) {
applyClockChip(
context = context,
Expand All @@ -518,6 +541,7 @@ constructor(
)
lastChipStyle = state.chipStyle
lastClockPosition = state.position
lastThemeVersion = state.themeVersion
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion ...m/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModelKosmos.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,15 @@ import com.android.systemui.statusbar.pipeline.shared.domain.interactor.homeStat
import com.android.systemui.statusbar.pipeline.shared.domain.interactor.homeStatusBarInteractor
import com.android.systemui.statusbar.pipeline.shared.ui.binder.HomeStatusBarViewBinder
import com.android.systemui.statusbar.pipeline.shared.ui.binder.HomeStatusBarViewBinderImpl
import com.android.systemui.statusbar.policy.configurationController
import com.android.systemui.statusbar.systemstatusicons.ui.viewmodel.systemStatusIconsViewModelFactory

var Kosmos.homeStatusBarViewBinder: HomeStatusBarViewBinder by
Kosmos.Fixture {
HomeStatusBarViewBinderImpl(connectedDisplaysStatusBarNotificationIconViewStoreFactory)
HomeStatusBarViewBinderImpl(
connectedDisplaysStatusBarNotificationIconViewStoreFactory,
configurationController,
)
}

var Kosmos.homeStatusBarViewModel: HomeStatusBarViewModel by
Expand Down
72 changes: 72 additions & 0 deletions services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.content.pm.UserInfo;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.RectF;
Expand Down Expand Up @@ -225,6 +227,7 @@ public void onUserUnlocking(@NonNull TargetUser user) {
*/
private static final long MIN_WALLPAPER_CRASH_TIME = 10000;
private static final int MAX_WALLPAPER_COMPONENT_LOG_LENGTH = 128;
private static final int WALLPAPER_COLOR_BITMAP_MAX_AREA = 112 * 112;

/**
* Observes the wallpaper for changes and notifies all IWallpaperServiceCallbacks
Expand Down Expand Up @@ -2980,6 +2983,7 @@ public WallpaperColors getWallpaperColors(int which, int userId, int displayId)
userId, false, true, "getWallpaperColors", null);

WallpaperData wallpaperData = null;
boolean shouldExtract;

synchronized (mLock) {
if (which == FLAG_LOCK) {
Expand All @@ -2995,11 +2999,79 @@ public WallpaperColors getWallpaperColors(int which, int userId, int displayId)
if (wallpaperData == null) {
return null;
}
shouldExtract = wallpaperData.primaryColors == null;
}

if (shouldExtract && extractStaticWallpaperColors(wallpaperData)) {
notifyWallpaperColorsChangedOnDisplay(wallpaperData, displayId);
}

return getAdjustedWallpaperColorsOnDimming(wallpaperData);
}

/**
* Fallback for a static ImageWallpaper engine that did not publish its initial colors.
*
* @return {@code true} when colors were extracted and stored for the current wallpaper.
*/
private boolean extractStaticWallpaperColors(WallpaperData wallpaper) {
final String cropFile;
final int wallpaperId;
final float dimAmount;

synchronized (mLock) {
if (wallpaper.primaryColors != null) {
return false;
}
final boolean imageWallpaper = mImageWallpaper.equals(wallpaper.getComponent())
|| wallpaper.getComponent() == null;
if (!imageWallpaper || !wallpaper.getCropFile().exists()) {
return false;
}
cropFile = wallpaper.getCropFile().getAbsolutePath();
wallpaperId = wallpaper.wallpaperId;
dimAmount = wallpaper.mWallpaperDimAmount;
}

final BitmapFactory.Options bounds = new BitmapFactory.Options();
bounds.inJustDecodeBounds = true;
BitmapFactory.decodeFile(cropFile, bounds);
if (bounds.outWidth <= 0 || bounds.outHeight <= 0) {
Slog.w(TAG, "Cannot extract colors because static wallpaper bounds are invalid");
return false;
}

int sampleSize = 1;
while ((long) (bounds.outWidth / sampleSize) * (bounds.outHeight / sampleSize)
> WALLPAPER_COLOR_BITMAP_MAX_AREA) {
sampleSize *= 2;
}
final BitmapFactory.Options options = new BitmapFactory.Options();
options.inSampleSize = sampleSize;
final Bitmap bitmap = BitmapFactory.decodeFile(cropFile, options);
if (bitmap == null) {
Slog.w(TAG, "Cannot extract colors because static wallpaper could not be read");
return false;
}

final WallpaperColors colors;
try {
colors = WallpaperColors.fromBitmap(bitmap, dimAmount);
} finally {
bitmap.recycle();
}

synchronized (mLock) {
if (wallpaper.wallpaperId != wallpaperId || wallpaper.primaryColors != null) {
return false;
}
wallpaper.primaryColors = colors;
wallpaper.mIsColorExtractedFromDim = false;
saveSettingsLocked(wallpaper.userId);
return true;
}
}

/**
* Gets the adjusted {@link WallpaperColors} if the wallpaper colors were not extracted from
* bitmap (i.e. it's a live wallpaper) and the dim amount is not 0. If these conditions apply,
Expand Down