Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev

Browse Source
This commit is contained in:
Stuart Scott
2014-12-02 21:04:53 +00:00
committed by Android (Google) Code Review
parent 75f304f922 7151cde3ca
commit 4e779ecd56
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
telephony/java/android/telephony/SubscriptionInfo.java
View File

@@ -27,6 +27,7 @@ import android.graphics.Rect;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.util.DisplayMetrics;
/** /**
* A Parcelable class for Subscription Information. * A Parcelable class for Subscription Information.
@@ -36,7 +37,7 @@ public class SubscriptionInfo implements Parcelable {
/** /**
* Size of text to render on the icon. * 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 * Subscription Identifier, this is a device unique number
@@ -197,10 +198,10 @@ public class SubscriptionInfo implements Parcelable {
public Bitmap createIconBitmap(Context context) { public Bitmap createIconBitmap(Context context) {
int width = mIconBitmap.getWidth(); int width = mIconBitmap.getWidth();
int height = mIconBitmap.getHeight(); int height = mIconBitmap.getHeight();
DisplayMetrics metrics = context.getResources().getDisplayMetrics();
// Create a new bitmap of the same size because it will be modified. // Create a new bitmap of the same size because it will be modified.
Bitmap workingBitmap = Bitmap.createBitmap(context.getResources().getDisplayMetrics(), Bitmap workingBitmap = Bitmap.createBitmap(metrics, width, height, mIconBitmap.getConfig());
width, height, mIconBitmap.getConfig());
Canvas canvas = new Canvas(workingBitmap); Canvas canvas = new Canvas(workingBitmap);
Paint paint = new Paint(); Paint paint = new Paint();
@@ -214,8 +215,10 @@ public class SubscriptionInfo implements Parcelable {
paint.setAntiAlias(true); paint.setAntiAlias(true);
paint.setTypeface(Typeface.create("sans-serif", Typeface.NORMAL)); paint.setTypeface(Typeface.create("sans-serif", Typeface.NORMAL));
paint.setColor(Color.WHITE); paint.setColor(Color.WHITE);
paint.setTextSize(TEXT_SIZE); // Set text size scaled by density
final String index = Integer.toString(mSimSlotIndex + 1); 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(); final Rect textBound = new Rect();
paint.getTextBounds(index, 0, 1, textBound); paint.getTextBounds(index, 0, 1, textBound);
final float xOffset = (width / 2.f) - textBound.centerX(); final float xOffset = (width / 2.f) - textBound.centerX();