diff options
author | Michael Jurka <mikejurka@google.com> | 2012-10-01 20:31:09 +0200 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2012-10-02 12:14:06 +0200 |
commit | daec1e8b0522e4b044d0a305a4bdef6f613779f7 (patch) | |
tree | a7e584cd6d406baf3b04678ee9b02bf45b242a1d /src/com/android/launcher2 | |
parent | db5dd02ad9b6ba197e69b8b726c8f999f0565a4e (diff) | |
download | android_packages_apps_Trebuchet-daec1e8b0522e4b044d0a305a4bdef6f613779f7.tar.gz android_packages_apps_Trebuchet-daec1e8b0522e4b044d0a305a4bdef6f613779f7.tar.bz2 android_packages_apps_Trebuchet-daec1e8b0522e4b044d0a305a4bdef6f613779f7.zip |
Fix issue where clicking home button caused search icon blip
Also, tweak size of icons in landscape mode
Bug: 7221345
Change-Id: Ib0d1445e165f291c09021f7dad08ad4d248e47ca
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/HolographicViewHelper.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/launcher2/HolographicViewHelper.java b/src/com/android/launcher2/HolographicViewHelper.java index 0e798da87..93d785351 100644 --- a/src/com/android/launcher2/HolographicViewHelper.java +++ b/src/com/android/launcher2/HolographicViewHelper.java @@ -21,6 +21,7 @@ import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.PorterDuff; +import android.graphics.drawable.Drawable; import android.graphics.drawable.StateListDrawable; import android.widget.ImageView; @@ -69,12 +70,13 @@ public class HolographicViewHelper { * Creates a copy of the original image. */ private Bitmap createOriginalImage(ImageView v, Canvas canvas) { + final Drawable d = v.getDrawable(); final Bitmap b = Bitmap.createBitmap( - v.getWidth(), v.getHeight(), Bitmap.Config.ARGB_8888); + d.getIntrinsicWidth(), d.getIntrinsicHeight(), Bitmap.Config.ARGB_8888); canvas.setBitmap(b); canvas.save(); - v.draw(canvas); + d.draw(canvas); canvas.restore(); canvas.setBitmap(null); @@ -86,12 +88,13 @@ public class HolographicViewHelper { * Responsibility for the bitmap is transferred to the caller. */ private Bitmap createPressImage(ImageView v, Canvas canvas) { + final Drawable d = v.getDrawable(); final Bitmap b = Bitmap.createBitmap( - v.getWidth(), v.getHeight(), Bitmap.Config.ARGB_8888); + d.getIntrinsicWidth(), d.getIntrinsicHeight(), Bitmap.Config.ARGB_8888); canvas.setBitmap(b); canvas.save(); - v.draw(canvas); + d.draw(canvas); canvas.restore(); canvas.drawColor(mHighlightColor, PorterDuff.Mode.SRC_IN); canvas.setBitmap(null); |