Merge "Fix odd avatar when message sender is a number" into pi-dev

import java.util.ArrayList;

import java.util.List;

import java.util.function.Consumer;

import java.util.regex.Pattern;

/**

 * A custom-built layout for the Notification.MessagingStyle allows dynamic addition and removal

public class MessagingLayout extends FrameLayout {

    private static final float COLOR_SHIFT_AMOUNT = 60;

    private static final Pattern SPECIAL_CHAR_PATTERN

            = Pattern.compile ("[!@#$%&*()_+=|<>?{}\\[\\]~-]");

    private static final Consumer<MessagingMessage> REMOVE_MESSAGE

            = MessagingMessage::removeMessage;

    public static final Interpolator LINEAR_OUT_SLOW_IN = new PathInterpolator(0f, 0f, 0.2f, 1f);

    }

    public Icon createAvatarSymbol(CharSequence senderName, String symbol, int layoutColor) {

        if (symbol.isEmpty() || TextUtils.isDigitsOnly(symbol) ||

                SPECIAL_CHAR_PATTERN.matcher(symbol).find()) {

            Icon avatarIcon = Icon.createWithResource(getContext(),

                    com.android.internal.R.drawable.messaging_user);

            avatarIcon.setTint(findColor(senderName, layoutColor));

            return avatarIcon;

        } else {

            Bitmap bitmap = Bitmap.createBitmap(mAvatarSize, mAvatarSize, Bitmap.Config.ARGB_8888);

            Canvas canvas = new Canvas(bitmap);

            float radius = mAvatarSize / 2.0f;

            canvas.drawText(symbol, radius, yPos, mTextPaint);

            return Icon.createWithBitmap(bitmap);

        }

    }

    private int findColor(CharSequence senderName, int layoutColor) {

        double luminance = NotificationColorUtil.calculateLuminance(layoutColor);