Update SubInfoRecord usage

bug: 17575308
Change-Id: I10de1abed8bb0b5bd59e64057f88f4cbad2dd05e

2 files changed, 12 insertions, 11 deletions

diff --git a/src/com/android/mms/ui/MessageUtils.java b/src/com/android/mms/ui/MessageUtils.java
index 363ce864..13b0a190 100644
--- a/src/com/android/mms/ui/MessageUtils.java
+++ b/src/com/android/mms/ui/MessageUtils.java
@@ -36,6 +36,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.database.sqlite.SqliteWrapper;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.media.CamcorderProfile;
 import android.media.RingtoneManager;
@@ -70,7 +71,6 @@ import com.android.mms.model.SlideModel;
 import com.android.mms.model.SlideshowModel;
 import com.android.mms.transaction.MmsMessageSender;
 import com.android.mms.util.AddressUtils;
-
 import com.google.android.mms.ContentType;
 import com.google.android.mms.MmsException;
 import com.google.android.mms.pdu.CharacterSets;
@@ -1105,17 +1105,18 @@ public class MessageUtils {
         buf.append(String.format(subNameContainer, displayName));
         // set background image
         Drawable drawable;
+        Resources resources = context.getResources();
         if (subInfo.getSimSlotIndex() >= 0) {
             // slotId being >= 0 means this SIM card is inserted
-            drawable = subInfo.getIcon();
+            drawable = new BitmapDrawable(resources, subInfo.createIconBitmap(context));
         } else {
-            drawable = context.getResources().getDrawable(R.drawable.sim_background_locked);
+            drawable = resources.getDrawable(R.drawable.sim_background_locked);
         }
         buf.setSpan(new BackgroundImageSpan(drawable), 0, buf.length(),
                 Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        // set subInfo color
-        int color = subInfo.getColor();
-        buf.setSpan(new ForegroundColorSpan(color), 0, buf.length(),
+        // set subInfo icon tint color
+        int tint = subInfo.getIconTint();
+        buf.setSpan(new ForegroundColorSpan(tint), 0, buf.length(),
                 Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         return buf;
     }
diff --git a/src/com/android/mms/ui/SubscriptionView.java b/src/com/android/mms/ui/SubscriptionView.java
index 5b5a3d6f..b21cc558 100644
--- a/src/com/android/mms/ui/SubscriptionView.java
+++ b/src/com/android/mms/ui/SubscriptionView.java
@@ -84,7 +84,7 @@ public class SubscriptionView extends LinearLayout {
      */
     public void setSubInfo(SubInfoRecord subInfo) {
         if (subInfo != null) {
-            setSubColor(subInfo.getColor());
+            setSubIconTint(subInfo.getIconTint());
             setSubName(subInfo.getDisplayName());
             setSubNum(subInfo.getNumber());
             // TODO currently fixed to the default
@@ -93,11 +93,11 @@ public class SubscriptionView extends LinearLayout {
     }
 
     /**
-     * Set Sub color view
-     * @param color The color value from SubInfoRecord of subscription
+     * Set Sub icon tint color view
+     * @param tint The icon tint color from SubInfoRecord of subscription
      */
-    public void setSubColor(int color) {
-        mSubColorView.setBackgroundColor(color);
+    public void setSubIconTint(int tint) {
+        mSubColorView.setBackgroundColor(tint);
     }
 
     /**