summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-09-05 14:58:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-05 14:58:49 +0000
commit6fdf6b22a75cbbd1728aca9e5305b4f68ef99c18 (patch)
tree417a868ef029e96aed8bc0d060128923f0228343 /src
parent5bb4c94a175938dff8178d781a3a839cbdc142b1 (diff)
parentc424f2290e96cea419f95c5ccb730a4946824c1b (diff)
downloadandroid_packages_apps_Trebuchet-6fdf6b22a75cbbd1728aca9e5305b4f68ef99c18.tar.gz
android_packages_apps_Trebuchet-6fdf6b22a75cbbd1728aca9e5305b4f68ef99c18.tar.bz2
android_packages_apps_Trebuchet-6fdf6b22a75cbbd1728aca9e5305b4f68ef99c18.zip
Merge "Fixing Intrinsic dimensions of FastBitmapDrawable" into ub-now-porkchop
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/FastBitmapDrawable.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java
index 7c9e77eef..ff02bbbc3 100644
--- a/src/com/android/launcher3/FastBitmapDrawable.java
+++ b/src/com/android/launcher3/FastBitmapDrawable.java
@@ -113,12 +113,12 @@ class FastBitmapDrawable extends Drawable {
@Override
public int getIntrinsicWidth() {
- return getBounds().width();
+ return mBitmap.getWidth();
}
@Override
public int getIntrinsicHeight() {
- return getBounds().height();
+ return mBitmap.getHeight();
}
@Override