diff options
| author | Daniel Sandler <dsandler@google.com> | 2011-06-17 12:43:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-17 12:43:21 -0700 |
| commit | d3cdbf0a4f6be4b14c056badc11ebe88028afcd6 (patch) | |
| tree | 22cde4d722c994114f463bf71c217ab3314af004 /core/java | |
| parent | 5bfa752f71cf7e6a5e7490d48eaef4054f99bebc (diff) | |
| parent | ebce0115e239919680fc5574ae4ca79e617fcce8 (diff) | |
| download | frameworks_base-d3cdbf0a4f6be4b14c056badc11ebe88028afcd6.zip frameworks_base-d3cdbf0a4f6be4b14c056badc11ebe88028afcd6.tar.gz frameworks_base-d3cdbf0a4f6be4b14c056badc11ebe88028afcd6.tar.bz2 | |
Merge "ICS updates to notification layouts."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/Notification.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index c9351af..170d2b5 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -929,15 +929,15 @@ public class Notification implements Parcelable if (mContentInfo != null) { contentView.setTextViewText(R.id.info, mContentInfo); } else if (mNumber > 0) { - if (mNumber > 999) { - contentView.setTextViewText(R.id.info, "999+"); + final int tooBig = mContext.getResources().getInteger( + R.integer.status_bar_notification_info_maxnum); + if (mNumber > tooBig) { + contentView.setTextViewText(R.id.info, mContext.getResources().getString( + R.string.status_bar_notification_info_overflow)); } else { NumberFormat f = NumberFormat.getIntegerInstance(); contentView.setTextViewText(R.id.info, f.format(mNumber)); } - contentView.setFloat(R.id.info, "setTextSize", - mContext.getResources().getDimensionPixelSize( - R.dimen.status_bar_content_number_size)); } else { contentView.setViewVisibility(R.id.info, View.GONE); } |