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

Merge "Remove line3 in big notification unless there's text to show." into jb-dev

Browse Source
This commit is contained in:
Daniel Sandler
2012-06-13 18:00:56 -07:00
committed by Android (Google) Code Review
parent 4323d6ea51 916ad91c38
commit 4365d066e8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1670,6 +1670,9 @@ public class Notification implements Parcelable
contentView.setTextViewText(R.id.text, overflowText);
contentView.setViewVisibility(R.id.overflow_divider, View.VISIBLE);
contentView.setViewVisibility(R.id.line3, View.VISIBLE);
} else {
contentView.setViewVisibility(R.id.overflow_divider, View.GONE);
contentView.setViewVisibility(R.id.line3, View.GONE);
}
return contentView;
@@ -1812,6 +1815,7 @@ public class Notification implements Parcelable
// 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) {

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

@@ -108,9 +108,8 @@
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="8dp"
android:layout_marginBottom="10dp"
android:layout_marginRight="8dp"
android:layout_marginTop="2dp"
android:singleLine="false"
android:visibility="gone"
android:maxLines="8"