summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-10-14 20:51:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-14 20:51:29 -0700
commita09c20a23038c1d77ae3d511da18a377572aed0c (patch)
treeb1a6b6897033db4a7856a418c3c880e48b8d4e97
parent2399d6a4f0d14e118ab706777753d3e2a5657dbc (diff)
parenta457211af55b2ad5bc58f4228ceb147ac22c92b0 (diff)
downloadframeworks_base-a09c20a23038c1d77ae3d511da18a377572aed0c.zip
frameworks_base-a09c20a23038c1d77ae3d511da18a377572aed0c.tar.gz
frameworks_base-a09c20a23038c1d77ae3d511da18a377572aed0c.tar.bz2
am a457211a: Merge "Fix getBuiltInWallpaper method" into klp-dev
* commit 'a457211af55b2ad5bc58f4228ceb147ac22c92b0': 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);