Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/widget/CustomShapeDrawable.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/widget/CustomShapeDrawable.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/widget/CustomShapeDrawable.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/widget/CustomShapeDrawable.java
deleted file mode 100644
index af8a50ff99dd2d96ef036216056366327042ea6e..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/widget/CustomShapeDrawable.java
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.widget;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapShader;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.Shader;
-import android.graphics.drawable.Drawable;
-
-/**
- * Base class for drawables that are to control what shape they take.
- */
-public abstract class CustomShapeDrawable extends Drawable {
-
-    /**
-     * Circular drawable that makes a round mask on top of bitmap.
-     */
-    public static class CircularDrawable extends CustomShapeDrawable {
-        /**
-         * Create a drawable based on the bitmap of the salient image.
-         */
-        public CircularDrawable(Bitmap bitmap) {
-            super(bitmap);
-        }
-
-        /**
-         * Create a drawable based on the pure color.
-         */
-        public CircularDrawable(int color) {
-            super(color);
-        }
-
-        @Override
-        protected void onBoundsChange(Rect bounds) {
-            mRect.set(0, 0, bounds.width(), bounds.height());
-            super.onBoundsChange(bounds);
-        }
-
-        @Override
-        public void draw(Canvas canvas) {
-            canvas.drawCircle(mRect.centerX(), mRect.centerY(), mRect.height() * 0.5f, mPaint);
-        }
-    }
-
-    protected RectF mRect = new RectF();
-    protected Paint mPaint = new Paint();
-    private int mBitmapWidth;
-    private int mBitmapHeight;
-    private boolean mShouldScale = true;
-
-    @Override
-    protected void onBoundsChange(Rect bounds) {
-        // Subclasses must override this function. It should first set up correct boundary of
-        // mRect and then call super.onBoundsChange().
-        if (mBitmapWidth > 0 && mBitmapHeight > 0) {
-            BitmapShader shader = (BitmapShader) mPaint.getShader();
-
-            float scale = 1.0f;
-            if (mShouldScale) {
-                scale = Math.max((float) bounds.width() / mBitmapWidth,
-                        (float) bounds.height() / mBitmapHeight);
-            }
-            float dx = (bounds.width() - mBitmapWidth * scale) * 0.5f + bounds.left;
-            float dy = (bounds.height() - mBitmapHeight * scale) * 0.5f + bounds.top;
-
-            Matrix matrix = new Matrix();
-            matrix.setScale(scale, scale);
-            matrix.postTranslate(dx, dy);
-            shader.setLocalMatrix(matrix);
-        }
-    }
-
-    protected CustomShapeDrawable(Bitmap bitmap) {
-        mPaint.setAntiAlias(true);
-        mPaint.setShader(
-                new BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP));
-        mBitmapWidth = bitmap.getWidth();
-        mBitmapHeight = bitmap.getHeight();
-    }
-
-    protected CustomShapeDrawable(int color) {
-        mPaint.setAntiAlias(true);
-        mPaint.setColor(color);
-        mBitmapWidth = 0;
-        mBitmapHeight = 0;
-    }
-
-    /**
-     * @param shouldScale True to let bitmap be scaled to match the size of
-     *                    the drawable. False to let it maintain its original size,
-     *                    regardless of the size of the drawable.
-     */
-    public void shouldScale(boolean shouldScale) {
-        mShouldScale = shouldScale;
-    }
-
-    @Override
-    public int getOpacity() {
-        return PixelFormat.TRANSLUCENT;
-    }
-
-    @Override
-    public void setAlpha(int alpha) {
-        mPaint.setAlpha(alpha);
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter cf) {
-        mPaint.setColorFilter(cf);
-    }
-
-}