From b0e378000fac0d4a2d5a75d887f5a6733bdab900 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 5 Apr 2016 18:02:13 -0700
Subject: [PATCH] Removing some wallpaper dependency

Change-Id: I3f88a76df40c64678e297f217d703ca296f2d5cd
---
 src/com/android/launcher3/Utilities.java                 | 4 ----
 src/com/android/launcher3/dynamicui/ExtractionUtils.java | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index ede4279460..3969d308b2 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -19,7 +19,6 @@ package com.android.launcher3;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.SearchManager;
-import android.app.WallpaperManager;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ActivityNotFoundException;
@@ -64,13 +63,10 @@ import android.widget.Toast;
 import com.android.launcher3.compat.UserHandleCompat;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.config.ProviderConfig;
-import com.android.launcher3.dynamicui.ColorExtractionService;
 import com.android.launcher3.util.IconNormalizer;
-import com.android.wallpaperpicker.common.WallpaperManagerCompat;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Locale;
diff --git a/src/com/android/launcher3/dynamicui/ExtractionUtils.java b/src/com/android/launcher3/dynamicui/ExtractionUtils.java
index a2ff607135..0b28ba6f95 100644
--- a/src/com/android/launcher3/dynamicui/ExtractionUtils.java
+++ b/src/com/android/launcher3/dynamicui/ExtractionUtils.java
@@ -22,7 +22,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 
 import com.android.launcher3.Utilities;
-import com.android.wallpaperpicker.common.WallpaperManagerCompat;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -34,6 +33,8 @@ public class ExtractionUtils {
     public static final String EXTRACTED_COLORS_PREFERENCE_KEY = "pref_extractedColors";
     public static final String WALLPAPER_ID_PREFERENCE_KEY = "pref_wallpaperId";
 
+    private static final int FLAG_SET_SYSTEM = 1 << 0; // TODO: use WallpaperManager.FLAG_SET_SYSTEM
+
     /**
      * Extract colors in the :wallpaper-chooser process, if the wallpaper id has changed.
      * When the new colors are saved in the LauncherProvider,
@@ -66,8 +67,7 @@ public class ExtractionUtils {
         // TODO: use WallpaperManager#getWallpaperId(WallpaperManager.FLAG_SET_SYSTEM) directly.
         try {
             Method getWallpaperId = WallpaperManager.class.getMethod("getWallpaperId", int.class);
-            return (int) getWallpaperId.invoke(wallpaperManager,
-                    WallpaperManagerCompat.FLAG_SET_SYSTEM);
+            return (int) getWallpaperId.invoke(wallpaperManager, FLAG_SET_SYSTEM);
         } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {
             return -1;
         }