From 415987388739561153010e1e1304511f6f501fb2 Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Mon, 11 Jan 2016 16:58:37 -0800 Subject: [PATCH] Fixed an inconsistency in the notification templates The text was never set to GONE when it was invisible, leading to weird cases when fading between notification contents. Change-Id: I92825b6d5a417c968c734061e55553be314af2b8 --- core/java/android/app/Notification.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index a392abd80de8..9832805f7178 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -3042,9 +3042,11 @@ public class Notification implements Parcelable contentView.setViewVisibility(R.id.right_icon, View.GONE); contentView.setViewVisibility(R.id.title, View.GONE); contentView.setTextViewText(R.id.title, null); + contentView.setViewVisibility(R.id.text, View.GONE); contentView.setTextViewText(R.id.text, null); contentView.setViewVisibility(R.id.line3, View.GONE); contentView.setViewVisibility(R.id.text_line_1, View.GONE); + contentView.setTextViewText(R.id.text_line_1, null); contentView.setViewVisibility(R.id.progress, View.GONE); } @@ -3093,11 +3095,11 @@ public class Notification implements Parcelable } boolean showProgress = handleProgressBar(hasProgress, contentView, ex); if (ex.getCharSequence(EXTRA_TEXT) != null) { - contentView.setTextViewText(showProgress ? R.id.text_line_1 : R.id.text, - processLegacyText(ex.getCharSequence(EXTRA_TEXT))); - if (showProgress) { - contentView.setViewVisibility(R.id.text_line_1, View.VISIBLE); - } + int textId = showProgress ? com.android.internal.R.id.text_line_1 + : com.android.internal.R.id.text; + contentView.setTextViewText(textId, processLegacyText( + ex.getCharSequence(EXTRA_TEXT))); + contentView.setViewVisibility(textId, View.VISIBLE); showLine3 = !showProgress; } // We want to add badge to first line of text. -- 2.11.0