summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2016-03-28 18:07:06 -0700
committerTony Wickham <twickham@google.com>2016-03-28 18:07:06 -0700
commit741124ec748488d6f3c21f5669c560af41f075f6 (patch)
treee791a5822bc5aebcb8759a535cceb706e56a80ea
parent159b638ed8c652b2943e3b05ea70f8b43ee73d72 (diff)
downloadandroid_packages_apps_WallpaperPicker-741124ec748488d6f3c21f5669c560af41f075f6.tar.gz
android_packages_apps_WallpaperPicker-741124ec748488d6f3c21f5669c560af41f075f6.tar.bz2
android_packages_apps_WallpaperPicker-741124ec748488d6f3c21f5669c560af41f075f6.zip
Remove WallpaperManagerCompat#getWallpaperId().
It is no longer necessary in the latest patch for color extraction. (We call WallpaperManager#getWallpaperId() from Utilities instead.) Change-Id: I9a9e5505e843674fcf3deaf3235fca1d1c6422d0
-rw-r--r--src/com/android/wallpaperpicker/common/WallpaperManagerCompat.java2
-rw-r--r--src/com/android/wallpaperpicker/common/WallpaperManagerCompatV16.java5
-rw-r--r--src/com/android/wallpaperpicker/common/WallpaperManagerCompatVN.java11
3 files changed, 0 insertions, 18 deletions
diff --git a/src/com/android/wallpaperpicker/common/WallpaperManagerCompat.java b/src/com/android/wallpaperpicker/common/WallpaperManagerCompat.java
index 92f24f2..96df749 100644
--- a/src/com/android/wallpaperpicker/common/WallpaperManagerCompat.java
+++ b/src/com/android/wallpaperpicker/common/WallpaperManagerCompat.java
@@ -30,6 +30,4 @@ public abstract class WallpaperManagerCompat {
int whichWallpaper) throws IOException;
public abstract void clear(int whichWallpaper) throws IOException;
-
- public abstract int getWallpaperId(int whichWallpaper);
}
diff --git a/src/com/android/wallpaperpicker/common/WallpaperManagerCompatV16.java b/src/com/android/wallpaperpicker/common/WallpaperManagerCompatV16.java
index ea3dc98..a320beb 100644
--- a/src/com/android/wallpaperpicker/common/WallpaperManagerCompatV16.java
+++ b/src/com/android/wallpaperpicker/common/WallpaperManagerCompatV16.java
@@ -24,9 +24,4 @@ public class WallpaperManagerCompatV16 extends WallpaperManagerCompat {
public void clear(int whichWallpaper) throws IOException {
mWallpaperManager.clear();
}
-
- @Override
- public int getWallpaperId(int whichWallpaper) {
- return -1;
- }
}
diff --git a/src/com/android/wallpaperpicker/common/WallpaperManagerCompatVN.java b/src/com/android/wallpaperpicker/common/WallpaperManagerCompatVN.java
index d044d1f..2eb9c51 100644
--- a/src/com/android/wallpaperpicker/common/WallpaperManagerCompatVN.java
+++ b/src/com/android/wallpaperpicker/common/WallpaperManagerCompatVN.java
@@ -40,15 +40,4 @@ public class WallpaperManagerCompatVN extends WallpaperManagerCompatV16 {
super.clear(whichWallpaper);
}
}
-
- @Override
- public int getWallpaperId(int whichWallpaper) {
- try {
- // TODO: use mWallpaperManager.getWallpaperId(whichWallpaper) without reflection.
- Method getWallpaperId = WallpaperManager.class.getMethod("getWallpaperId", int.class);
- return (int) getWallpaperId.invoke(mWallpaperManager, whichWallpaper);
- } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {
- return -1;
- }
- }
}