1 files changed, 5 insertions, 19 deletions
diff --git a/src/com/android/contacts/common/widget/CheckableFlipDrawable.java b/src/com/android/contacts/common/widget/CheckableFlipDrawable.java
index c64ebba8..ed088963 100644
--- a/src/com/android/contacts/common/widget/CheckableFlipDrawable.java
+++ b/src/com/android/contacts/common/widget/CheckableFlipDrawable.java
@@ -70,10 +70,6 @@ public class CheckableFlipDrawable extends FlipDrawable implements
         invalidateSelf();
     }
 
-    public void scaleFrontDrawableToBounds(boolean fitBounds) {
-        mFrontDrawable.scaleDrawableToBounds(fitBounds);
-    }
-
     public void setCheckMarkBackgroundColor(int color) {
         mCheckmarkDrawable.setBackgroundColor(color);
         invalidateSelf();
@@ -129,8 +125,6 @@ public class CheckableFlipDrawable extends FlipDrawable implements
 
     private static class FrontDrawable extends Drawable implements Drawable.Callback {
         private Drawable mDrawable;
-        private boolean mScaleDrawableToBounds = false; // only applies to drawables with intrinsic
-                                                        // height and width
 
         public FrontDrawable(Drawable d) {
             mDrawable = d;
@@ -149,10 +143,6 @@ public class CheckableFlipDrawable extends FlipDrawable implements
             invalidateSelf();
         }
 
-        public void scaleDrawableToBounds(boolean fitBounds) {
-            mScaleDrawableToBounds = fitBounds;
-        }
-
         @Override
         public void setTintMode(PorterDuff.Mode tintMode) {
             mDrawable.setTintMode(tintMode);
@@ -197,16 +187,12 @@ public class CheckableFlipDrawable extends FlipDrawable implements
             if (w <= 0 || h <= 0) {
                 mDrawable.draw(canvas);
             } else {
+                final float widthScale = (float) bounds.width() / (float) w;
+                final float heightScale = (float) bounds.height() / (float) h;
+                final float scale = Math.max(widthScale, heightScale);
                 canvas.save();
-                if (mScaleDrawableToBounds) {
-                    final float widthScale = (float) bounds.width() / (float) w;
-                    final float heightScale = (float) bounds.height() / (float) h;
-                    final float scale = Math.max(widthScale, heightScale);
-                    canvas.scale(scale, scale);
-                    canvas.translate(bounds.left, bounds.top);
-                } else {
-                    canvas.translate(bounds.centerX() - (w/2f), bounds.centerY() - (h/2f));
-                }
+                canvas.scale(scale, scale);
+                canvas.translate(bounds.left, bounds.top);
                 mDrawable.draw(canvas);
                 canvas.restore();
             }