am 343a88da: am b19acb99: Merge "Updating Subscription Info Icon" into lmp-mr1-dev

* commit '343a88da1b93642f8d8b75f7de43918378b573f8':
  Updating Subscription Info Icon

core/res/res/values/symbols.xml

@@ -1206,6 +1206,9 @@
   <java-symbol type="drawable" name="sim_dark_orange" />
   <java-symbol type="drawable" name="sim_dark_purple" />
 
+  <java-symbol type="drawable" name="ic_sim_card_multi_24px_clr" />
+  <java-symbol type="drawable" name="ic_sim_card_multi_48px_clr" />
+
   <java-symbol type="drawable" name="ic_account_circle" />
   <java-symbol type="color" name="user_icon_1" />
   <java-symbol type="color" name="user_icon_2" />

telephony/java/android/telephony/SubscriptionInfo.java

@@ -33,6 +33,11 @@ import android.os.Parcelable;
  */
 public class SubscriptionInfo implements Parcelable {
 
+    /**
+     * Size of text to render on the icon.
+     */
+    private static final int TEXT_SIZE = 22;
+
     /**
      * Subscription Identifier, this is a device unique number
      * and not an index into an array
@@ -201,10 +206,11 @@ public class SubscriptionInfo implements Parcelable {
         paint.setColorFilter(null);
 
         // Write the sim slot index.
+        paint.setAntiAlias(true);
         paint.setTypeface(Typeface.create("sans-serif", Typeface.NORMAL));
         paint.setColor(Color.WHITE);
-        paint.setTextSize(12);
-        final String index = Integer.toString(mSimSlotIndex);
+        paint.setTextSize(TEXT_SIZE);
+        final String index = Integer.toString(mSimSlotIndex + 1);
         final Rect textBound = new Rect();
         paint.getTextBounds(index, 0, 1, textBound);
         final float xOffset = (width / 2.f) - textBound.centerX();