commit d3b9aa2116a29aa327d5d6ce4ea1a9e0aead068e
author Sunny Goyal <sunnygoyal@google.com> Mon Sep 08 13:48:48 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 08 13:48:48 2014 +0000
tree 417a868ef029e96aed8bc0d060128923f0228343
parent 028ce83f17b47df5f86789ddbc1904930a034be3
parent e962acef86a4f1f634f268baa0102fc334db60c4

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

* commit 'e962acef86a4f1f634f268baa0102fc334db60c4':
  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