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

Commit 86682cfe authored by George Lin's avatar George Lin Committed by Automerger Merge Worker
Browse files

Remove WallpaperManagerCompat (2/3) am: 32a93c08 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/24152502



Change-Id: I95c2aac6d87b10fcb457f7140ed5359bd2fa4a06
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b93ac95 32a93c08

src/com/android/customization/model/color/ColorProvider.kt

+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(