diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-09-30 12:18:25 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-09-30 12:19:13 -0700 |
| commit | b57c893db8c567ffeeb3c61f4fb3545c4a256441 (patch) | |
| tree | 3e8f5fe54b552ebea10583964dccc59f44875a67 /src/com/android/launcher3/dynamicui | |
| parent | de45283519570477b2c01feaa12e19e53cf0b57d (diff) | |
| download | android_packages_apps_Trebuchet-b57c893db8c567ffeeb3c61f4fb3545c4a256441.tar.gz android_packages_apps_Trebuchet-b57c893db8c567ffeeb3c61f4fb3545c4a256441.tar.bz2 android_packages_apps_Trebuchet-b57c893db8c567ffeeb3c61f4fb3545c4a256441.zip | |
Removing some TODOs with proper system API
Change-Id: I0d0e667cd6af8a7b9dbf3d0fd417f009ae402519
Diffstat (limited to 'src/com/android/launcher3/dynamicui')
| -rw-r--r-- | src/com/android/launcher3/dynamicui/ExtractionUtils.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/com/android/launcher3/dynamicui/ExtractionUtils.java b/src/com/android/launcher3/dynamicui/ExtractionUtils.java index 6dc0035ee..1e663a9ae 100644 --- a/src/com/android/launcher3/dynamicui/ExtractionUtils.java +++ b/src/com/android/launcher3/dynamicui/ExtractionUtils.java @@ -16,18 +16,18 @@ package com.android.launcher3.dynamicui; +import android.annotation.TargetApi; import android.app.WallpaperManager; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.graphics.Color; +import android.os.Build; import android.support.v4.graphics.ColorUtils; import android.support.v7.graphics.Palette; import com.android.launcher3.Utilities; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.List; /** @@ -37,7 +37,6 @@ 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 private static final float MIN_CONTRAST_RATIO = 2f; /** @@ -73,14 +72,10 @@ public class ExtractionUtils { return wallpaperId != savedWallpaperId; } + @TargetApi(Build.VERSION_CODES.N) public static int getWallpaperId(WallpaperManager wallpaperManager) { - // TODO: use WallpaperManager#getWallpaperId(WallpaperManager.FLAG_SET_SYSTEM) directly. - try { - Method getWallpaperId = WallpaperManager.class.getMethod("getWallpaperId", int.class); - return (int) getWallpaperId.invoke(wallpaperManager, FLAG_SET_SYSTEM); - } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException e) { - return -1; - } + return Utilities.isNycOrAbove() ? + wallpaperManager.getWallpaperId(WallpaperManager.FLAG_SYSTEM) : -1; } public static boolean isSuperLight(Palette p) { |