PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removing some wallpaper dependency

Browse Source 
am: b0e3780

* commit 'b0e378000fac0d4a2d5a75d887f5a6733bdab900':
  Removing some wallpaper dependency

Change-Id: Id09cffeee436e6e9ed6d6010a3cee00676619f0c
This commit is contained in:
Sunny Goyal
2016-04-06 01:09:36 +00:00
committed by android-build-merger
parent 70b485b234 b0e378000f
commit c79e640b5c
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Utilities.java
-4
View File
@@ -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;
src/com/android/launcher3/dynamicui/ExtractionUtils.java
+3 -3
View File
@@ -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;
}