Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32a93c08 authored by George Lin's avatar George Lin
Browse files

Remove WallpaperManagerCompat (2/3)

Test: Build and manually test setting wallpapers
Bug: 292275263
Change-Id: I7d1ad0f33ca52e8d0d216ab614916cace67aa45b
parent 5cefe4e4
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@
package com.android.customization.model.color

import android.app.WallpaperColors
import android.app.WallpaperManager
import android.content.Context
import android.content.res.ColorStateList
import android.content.res.Resources
@@ -38,7 +39,6 @@ import com.android.customization.picker.color.shared.model.ColorType
import com.android.systemui.monet.ColorScheme
import com.android.systemui.monet.Style
import com.android.wallpaper.R
import com.android.wallpaper.compat.WallpaperManagerCompat
import com.android.wallpaper.module.InjectorProvider
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
@@ -130,9 +130,9 @@ class ColorProvider(private val context: Context, stubPackageName: String) :
    private fun isLockScreenWallpaperLastApplied(): Boolean {
        // The WallpaperId increases every time a new wallpaper is set, so the larger wallpaper id
        // is the most recently set wallpaper
        val manager = InjectorProvider.getInjector().getWallpaperManagerCompat(mContext)
        return manager.getWallpaperId(WallpaperManagerCompat.FLAG_LOCK) >
            manager.getWallpaperId(WallpaperManagerCompat.FLAG_SYSTEM)
        val manager = WallpaperManager.getInstance(mContext)
        return manager.getWallpaperId(WallpaperManager.FLAG_LOCK) >
            manager.getWallpaperId(WallpaperManager.FLAG_SYSTEM)
    }

    private fun loadSeedColors(