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

am b46f3f67: Merge "Defensively reset the default state of layout elements." into jb-dev

Browse Source 
* commit 'b46f3f6743f015cd6e0cfd21639b82fcdb5e6983':
  Defensively reset the default state of layout elements.
This commit is contained in:
Chris Wren
2012-05-16 12:04:20 -07:00
committed by Android Git Automerger
parent e00913ebe4 b46f3f6743
commit 626a16651c
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1637,15 +1637,21 @@ public class Notification implements Parcelable
if (mBuilder.mSubText == null) {
contentView.setViewVisibility(R.id.line3, View.GONE);
} else {
contentView.setViewVisibility(R.id.line3, View.VISIBLE);
}
if (mBigContentTitle != null && mBigContentTitle.equals("")) {
contentView.setViewVisibility(R.id.line1, View.GONE);
} else {
contentView.setViewVisibility(R.id.line1, View.VISIBLE);
}
if (mSummaryText != null && !mSummaryText.equals("")) {
contentView.setViewVisibility(R.id.overflow_title, View.VISIBLE);
contentView.setTextViewText(R.id.overflow_title, mSummaryText);
} else {
contentView.setViewVisibility(R.id.overflow_title, View.GONE);
}
return contentView;
@@ -1852,6 +1858,8 @@ public class Notification implements Parcelable
if (str != null && !str.equals("")) {
contentView.setViewVisibility(rowIds[i], View.VISIBLE);
contentView.setTextViewText(rowIds[i], str);
} else {
contentView.setViewVisibility(rowIds[i], View.GONE);
}
i++;
}