summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Wright <michaelwr@google.com> 2013-10-15 23:40:14 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-10-15 23:40:14 +0000
commit6bd7603a56cd671c4523d66c1e7378c27a6ac33c (patch)
treeca7ed5253ad2e1056252499c79487d3d4efaac56
parente1b6b6c5816b321864b6a5d72a46860fda8fa7cd (diff)
parentb9fca9997100f209e98f0559c54c875b9e661e9f (diff)
Merge "Force the wallpaper to reload when dimensions change" into klp-dev
-rw-r--r--core/java/android/app/WallpaperManager.java1
-rw-r--r--packages/SystemUI/src/com/android/systemui/ImageWallpaper.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java
index 16c9da6a6987..ced72f80a029 100644
--- a/core/java/android/app/WallpaperManager.java
+++ b/core/java/android/app/WallpaperManager.java
@@ -280,6 +280,7 @@ public class WallpaperManager {
synchronized (this) {
mWallpaper = null;
mDefaultWallpaper = null;
+ mHandler.removeMessages(MSG_CLEAR_WALLPAPER);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
index 6fa863db93f3..4b0c2cb31ee8 100644
--- a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
+++ b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
@@ -326,6 +326,7 @@ public class ImageWallpaper extends WallpaperService {
((mBackground == null) ? 0 : mBackground.getHeight()) + ", " +
dw + ", " + dh);
}
+ mWallpaperManager.forgetLoadedWallpaper();
updateWallpaperLocked();
if (mBackground == null) {
if (DEBUG) {