diff options
author | Stuart Scott <stuartscott@google.com> | 2014-11-21 11:12:03 -0800 |
---|---|---|
committer | Stuart Scott <stuartscott@google.com> | 2014-12-01 11:14:53 -0800 |
commit | 7151cde3ca742d24ea97f163526519b83431c87e (patch) | |
tree | 48537f78298b50a78a0d897d41785bd3ba17173b /telephony/java/android/telephony/SubscriptionInfo.java | |
parent | 015b9e56d4ad528dd406672ef6264c85e41a20fd (diff) | |
download | frameworks_base-7151cde3ca742d24ea97f163526519b83431c87e.zip frameworks_base-7151cde3ca742d24ea97f163526519b83431c87e.tar.gz frameworks_base-7151cde3ca742d24ea97f163526519b83431c87e.tar.bz2 |
Subscription Info density-dependent text size and localized SIM slot index
Change-Id: I49fed470ea82c91ff7d77df2c3447b17a203a38d
Diffstat (limited to 'telephony/java/android/telephony/SubscriptionInfo.java')
-rw-r--r-- | telephony/java/android/telephony/SubscriptionInfo.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java index c8b782f..e57f9e3 100644 --- a/telephony/java/android/telephony/SubscriptionInfo.java +++ b/telephony/java/android/telephony/SubscriptionInfo.java @@ -27,6 +27,7 @@ import android.graphics.Rect; import android.graphics.Typeface; import android.os.Parcel; import android.os.Parcelable; +import android.util.DisplayMetrics; /** * A Parcelable class for Subscription Information. @@ -36,7 +37,7 @@ public class SubscriptionInfo implements Parcelable { /** * Size of text to render on the icon. */ - private static final int TEXT_SIZE = 22; + private static final int TEXT_SIZE = 16; /** * Subscription Identifier, this is a device unique number @@ -197,10 +198,10 @@ public class SubscriptionInfo implements Parcelable { public Bitmap createIconBitmap(Context context) { int width = mIconBitmap.getWidth(); int height = mIconBitmap.getHeight(); + DisplayMetrics metrics = context.getResources().getDisplayMetrics(); // Create a new bitmap of the same size because it will be modified. - Bitmap workingBitmap = Bitmap.createBitmap(context.getResources().getDisplayMetrics(), - width, height, mIconBitmap.getConfig()); + Bitmap workingBitmap = Bitmap.createBitmap(metrics, width, height, mIconBitmap.getConfig()); Canvas canvas = new Canvas(workingBitmap); Paint paint = new Paint(); @@ -214,8 +215,10 @@ public class SubscriptionInfo implements Parcelable { paint.setAntiAlias(true); paint.setTypeface(Typeface.create("sans-serif", Typeface.NORMAL)); paint.setColor(Color.WHITE); - paint.setTextSize(TEXT_SIZE); - final String index = Integer.toString(mSimSlotIndex + 1); + // Set text size scaled by density + paint.setTextSize(TEXT_SIZE * metrics.density); + // Convert sim slot index to localized string + final String index = String.format("%d", mSimSlotIndex + 1); final Rect textBound = new Rect(); paint.getTextBounds(index, 0, 1, textBound); final float xOffset = (width / 2.f) - textBound.centerX(); |