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

Merge "Various notification template cleanups." into jb-dev

Browse Source
This commit is contained in:
Daniel Sandler
2012-06-08 13:38:02 -07:00
committed by Android (Google) Code Review
parent 78fc35bde4 619738c9e7
commit 6cf0c3365a
4 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/app/Notification.java
View File

@@ -1614,6 +1614,7 @@ public class Notification implements Parcelable
{
private CharSequence mBigContentTitle;
private CharSequence mSummaryText = null;
private boolean mSummaryTextSet = false;
protected Builder mBuilder;
@@ -1630,6 +1631,7 @@ public class Notification implements Parcelable
*/
protected void internalSetSummaryText(CharSequence cs) {
mSummaryText = cs;
mSummaryTextSet = true;
}
public void setBuilder(Builder builder) {
@@ -1660,9 +1662,13 @@ public class Notification implements Parcelable
contentView.setViewVisibility(R.id.line1, View.VISIBLE);
}
// The last line defaults to the content text or subtext, but can be replaced by mSummaryText
if (mSummaryText != null && !mSummaryText.equals("")) {
contentView.setTextViewText(R.id.text, mSummaryText);
// The last line defaults to the subtext, but can be replaced by mSummaryText
final CharSequence overflowText =
mSummaryTextSet ? mSummaryText
: mBuilder.mSubText;
if (overflowText != null) {
contentView.setTextViewText(R.id.text, overflowText);
contentView.setViewVisibility(R.id.overflow_divider, View.VISIBLE);
contentView.setViewVisibility(R.id.line3, View.VISIBLE);
}
@@ -1803,9 +1809,16 @@ public class Notification implements Parcelable
}
private RemoteViews makeBigContentView() {
// Remove the content text so line3 disappears entirely
// Remove the content text so line3 only shows if you have a summary
final boolean hadThreeLines = (mBuilder.mContentText != null && mBuilder.mSubText != null);
mBuilder.mContentText = null;
RemoteViews contentView = getStandardView(R.layout.notification_template_big_text);
if (hadThreeLines) {
// vertical centering
contentView.setViewPadding(R.id.line1, 0, 0, 0, 0);
}
contentView.setTextViewText(R.id.big_text, mBigText);
contentView.setViewVisibility(R.id.big_text, View.VISIBLE);
contentView.setViewVisibility(R.id.text2, View.GONE);
@@ -1875,7 +1888,10 @@ public class Notification implements Parcelable
}
private RemoteViews makeBigContentView() {
// Remove the content text so line3 disappears unless you have a summary
mBuilder.mContentText = null;
RemoteViews contentView = getStandardView(R.layout.notification_template_inbox);
contentView.setViewVisibility(R.id.text2, View.GONE);
int[] rowIds = {R.id.inbox_text0, R.id.inbox_text1, R.id.inbox_text2, R.id.inbox_text3,

2
core/res/res/layout/notification_template_big_picture.xml
View File

@@ -46,7 +46,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="208dp"
android:layout_marginLeft="64dp"
android:paddingLeft="64dp"
android:layout_gravity="bottom"
android:background="#CC111111"
>

1
core/res/res/layout/notification_template_big_text.xml
View File

@@ -110,6 +110,7 @@
android:layout_height="0dp"
android:layout_marginBottom="8dp"
android:layout_marginRight="8dp"
android:layout_marginTop="2dp"
android:singleLine="false"
android:visibility="gone"
android:maxLines="8"

12
core/res/res/layout/notification_template_inbox.xml
View File

@@ -191,9 +191,8 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="1px"
android:id="@+id/overflow_divider"
android:layout_marginTop="8dp"
android:visibility="visible"
android:id="@+id/action_divider"
android:visibility="gone"
android:background="?android:attr/dividerHorizontal" />
<include
layout="@layout/notification_action_list"
@@ -204,9 +203,10 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="1px"
android:id="@+id/action_divider"
android:visibility="gone"
android:background="?android:attr/dividerHorizontal" /><!-- note: divider below actions -->
android:id="@+id/overflow_divider"
android:layout_marginTop="8dp"
android:visibility="visible"
android:background="?android:attr/dividerHorizontal" />
<LinearLayout
android:id="@+id/line3"
android:layout_width="match_parent"