diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-06-13 18:03:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-13 18:03:40 -0700 |
| commit | cb629f38008ad4f48a956a8d74daa65eff351a75 (patch) | |
| tree | f4238ae81128d617eac875bd78c41ea75adedcf2 /core | |
| parent | 129167cfe641c505fcea6c37a1ed086bbeadf8c1 (diff) | |
| parent | 4365d066e8beed17b61ba51c728d60a9baa499be (diff) | |
| download | frameworks_base-cb629f38008ad4f48a956a8d74daa65eff351a75.zip frameworks_base-cb629f38008ad4f48a956a8d74daa65eff351a75.tar.gz frameworks_base-cb629f38008ad4f48a956a8d74daa65eff351a75.tar.bz2 | |
am 4365d066: Merge "Remove line3 in big notification unless there\'s text to show." into jb-dev
* commit '4365d066e8beed17b61ba51c728d60a9baa499be':
Remove line3 in big notification unless there's text to show.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/Notification.java | 4 | ||||
| -rw-r--r-- | core/res/res/layout/notification_template_big_text.xml | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index ec35a3f..bb497c0 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -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) { diff --git a/core/res/res/layout/notification_template_big_text.xml b/core/res/res/layout/notification_template_big_text.xml index d377882..0b3386b 100644 --- a/core/res/res/layout/notification_template_big_text.xml +++ b/core/res/res/layout/notification_template_big_text.xml @@ -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" |