resolve merge conflicts of 19d8e4e0 to oc-mr1-dev

import android.app.Notification;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.res.ColorStateList;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.Canvas;

import android.graphics.Color;

import android.graphics.ColorMatrix;

import android.graphics.ColorMatrixColorFilter;

import android.graphics.Paint;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import com.android.systemui.statusbar.notification.NotificationUtils;

import java.text.NumberFormat;

import java.util.Arrays;

public class StatusBarIconView extends AnimatedImageView {

    public static final int NO_COLOR = 0;

    /**

     * Multiply alpha values with (1+DARK_ALPHA_BOOST) when dozing. The chosen value boosts

     * everything above 30% to 50%, making it appear on 1bit color depths.

     */

    private static final float DARK_ALPHA_BOOST = 0.67f;

    private final int ANIMATION_DURATION_FAST = 100;

    public static final int STATE_ICON = 0;

    private final NotificationIconDozeHelper mDozer;

    private int mContrastedDrawableColor;

    private int mCachedContrastBackgroundColor = NO_COLOR;

    private float[] mMatrix;

    private ColorMatrixColorFilter mMatrixColorFilter;

    private boolean mIsInShelf;

    public StatusBarIconView(Context context, String slot, StatusBarNotification sbn) {

    private void updateIconColor() {

        if (mCurrentSetColor != NO_COLOR) {

            setImageTintList(ColorStateList.valueOf(NotificationUtils.interpolateColors(

                    mCurrentSetColor, Color.WHITE, mDarkAmount)));

            if (mMatrixColorFilter == null) {

                mMatrix = new float[4 * 5];

                mMatrixColorFilter = new ColorMatrixColorFilter(mMatrix);

            }

            int color = NotificationUtils.interpolateColors(

                    mCurrentSetColor, Color.WHITE, mDarkAmount);

            updateTintMatrix(mMatrix, color, DARK_ALPHA_BOOST * mDarkAmount);

            mMatrixColorFilter.setColorMatrixArray(mMatrix);

            setColorFilter(mMatrixColorFilter);

            invalidate();  // setColorFilter only invalidates if the filter instance changed.

        } else {

            setImageTintList(null);

            mDozer.updateGrayscale(this, mDarkAmount);

        }

    }

    /**

     * Updates {@param array} such that it represents a matrix that changes RGB to {@param color}

     * and multiplies A with 1+{@param alphaBoost}.

     */

    private static void updateTintMatrix(float[] array, int color, float alphaBoost) {

        Arrays.fill(array, 0);

        array[4] = Color.red(color);

        array[9] = Color.green(color);

        array[14] = Color.blue(color);

        array[18] = 1 + alphaBoost;

    }

    public void setIconColor(int iconColor, boolean animate) {

        if (mIconColor != iconColor) {

            mIconColor = iconColor;