Merge "Update the work icon." into oc-mr1-dev

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="48dp"

        android:height="48dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M24,24m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"

        android:fillColor="#FF6D00"/>

    <path

        android:pathData="M35.2,15.6h-5.6v-2.8c0,-1.55 -1.25,-2.8 -2.8,-2.8h-5.6c-1.55,0 -2.8,1.25 -2.8,2.8v2.8h-5.6c-1.55,0 -2.79,1.25 -2.79,2.8L10,33.8c0,1.55 1.25,2.8 2.8,2.8h22.4c1.55,0 2.8,-1.25 2.8,-2.8V18.4C38,16.85 36.75,15.6 35.2,15.6zM24,28.2c-1.54,0 -2.8,-1.26 -2.8,-2.8s1.26,-2.8 2.8,-2.8c1.54,0 2.8,1.26 2.8,2.8S25.54,28.2 24,28.2zM26.8,15.6h-5.6v-2.8h5.6V15.6z"

        android:fillColor="#FFFFFF"/>

        android:pathData="M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -1.99,0.89 -1.99,2L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM14,6h-4L10,4h4v2z"

        android:fillColor="#000000"/>

</vector>

 No newline at end of file

    public static Drawable getUserIcon(Context context, UserManager um, UserInfo user) {

        final int iconSize = UserIconDrawable.getSizeForList(context);

        if (user.isManagedProfile()) {

            return context.getDrawable(com.android.internal.R.drawable.ic_corp_icon);

            Drawable drawable = context.getDrawable(com.android.internal.R.drawable.ic_corp_icon);

            drawable.setBounds(0, 0, iconSize, iconSize);

            return drawable;

        }

        if (user.iconPath != null) {

            Bitmap icon = um.getUserIcon(user.id);