commit e962acef86a4f1f634f268baa0102fc334db60c4
author Sunny Goyal <sunnygoyal@google.com> Fri Sep 05 15:34:42 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 05 15:34:42 2014 +0000
tree 417a868ef029e96aed8bc0d060128923f0228343
parent 0cc5a6562a7910c65ee8ed321b2fdcc055a72917
parent 6fdf6b22a75cbbd1728aca9e5305b4f68ef99c18

am 6fdf6b22: Merge "Fixing Intrinsic dimensions of FastBitmapDrawable" into ub-now-porkchop

* commit '6fdf6b22a75cbbd1728aca9e5305b4f68ef99c18':
  Fixing Intrinsic dimensions of FastBitmapDrawable

src/com/android/launcher3/FastBitmapDrawable.java

diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java
index 7c9e77e..ff02bbb 100644
--- a/src/com/android/launcher3/FastBitmapDrawable.java
+++ b/src/com/android/launcher3/FastBitmapDrawable.java
@@ -113,12 +113,12 @@
 
     @Override
     public int getIntrinsicWidth() {
-        return getBounds().width();
+        return mBitmap.getWidth();
     }
 
     @Override
     public int getIntrinsicHeight() {
-        return getBounds().height();
+        return mBitmap.getHeight();
     }
 
     @Override