summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-10-15 05:05:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-15 05:05:42 -0700
commit38edc674814058f48517484d56495c06f7fc7807 (patch)
tree720f1193e31c6733f80f89c9a8c6bb9fe8adece1
parent2836cd74a9765dbd39f35b15d0a7cc3cc995442f (diff)
parenta0ce8c92cfd06af14962bfba120bd176c936d4f0 (diff)
downloadframeworks_base-38edc674814058f48517484d56495c06f7fc7807.zip
frameworks_base-38edc674814058f48517484d56495c06f7fc7807.tar.gz
frameworks_base-38edc674814058f48517484d56495c06f7fc7807.tar.bz2
am a0ce8c92: am a09c20a2: am a457211a: Merge "Fix getBuiltInWallpaper method" into klp-dev
* commit 'a0ce8c92cfd06af14962bfba120bd176c936d4f0': Fix getBuiltInWallpaper method
-rw-r--r--core/java/android/app/WallpaperManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java
index eb1f265..16c9da6 100644
--- a/core/java/android/app/WallpaperManager.java
+++ b/core/java/android/app/WallpaperManager.java
@@ -461,7 +461,7 @@ public class WallpaperManager {
float right = left + outWidth;
float top = (inHeight - outHeight) * verticalAlignment;
float bottom = top + outHeight;
- cropRectF = new RectF(bottom, left, right, top);
+ cropRectF = new RectF(left, top, right, bottom);
}
Rect roundedTrueCrop = new Rect();
cropRectF.roundOut(roundedTrueCrop);