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

Merge "Possibly fix bad notification updates." into honeycomb

Browse Source
This commit is contained in:
Joe Onorato
2011-01-12 17:07:11 -08:00
committed by Android (Google) Code Review
parent 0123afbb22 c9596d6d8e
commit f4699efb63
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -574,7 +574,15 @@ public class Notification implements Parcelable
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("Notification(vibrate="); sb.append("Notification(contentView=");
if (contentView != null) {
sb.append(contentView.getPackage());
sb.append("/0x");
sb.append(Integer.toHexString(contentView.getLayoutId()));
} else {
sb.append("null");
}
sb.append(" vibrate=");
if (this.vibrate != null) { if (this.vibrate != null) {
int N = this.vibrate.length-1; int N = this.vibrate.length-1;
sb.append("["); sb.append("[");

10
packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
View File

@@ -598,18 +598,18 @@ public class TabletStatusBar extends StatusBar implements
// Can we just reapply the RemoteViews in place? If when didn't change, the order // Can we just reapply the RemoteViews in place? If when didn't change, the order
// didn't change. // didn't change.
boolean orderUnchanged = (notification.notification.when == oldNotification.notification.when boolean contentsUnchanged = notification.isOngoing() == oldNotification.isOngoing()
&& notification.isOngoing() == oldNotification.isOngoing()
&& oldEntry.expanded != null && oldEntry.expanded != null
&& contentView != null && contentView != null
&& oldContentView != null && oldContentView != null
&& contentView.getPackage() != null && contentView.getPackage() != null
&& oldContentView.getPackage() != null && oldContentView.getPackage() != null
&& oldContentView.getPackage().equals(contentView.getPackage()) && oldContentView.getPackage().equals(contentView.getPackage())
&& oldContentView.getLayoutId() == contentView.getLayoutId()); && oldContentView.getLayoutId() == contentView.getLayoutId();
ViewGroup rowParent = (ViewGroup) oldEntry.row.getParent(); ViewGroup rowParent = (ViewGroup) oldEntry.row.getParent();
boolean isLastAnyway = rowParent.indexOfChild(oldEntry.row) == rowParent.getChildCount() - 1; boolean orderUnchanged = notification.notification.when==oldNotification.notification.when;
if (orderUnchanged || isLastAnyway) { boolean isLastAnyway = rowParent.indexOfChild(oldEntry.row) == rowParent.getChildCount()-1;
if (contentsUnchanged && (orderUnchanged || isLastAnyway)) {
if (DEBUG) Slog.d(TAG, "reusing notification for key: " + key); if (DEBUG) Slog.d(TAG, "reusing notification for key: " + key);
oldEntry.notification = notification; oldEntry.notification = notification;
try { try {

2
tests/StatusBar/res/layout/notification_builder_test.xml
View File

@@ -322,7 +322,7 @@
<RadioButton <RadioButton
android:id="@+id/title_short" android:id="@+id/title_short"
style="@style/FieldContents" style="@style/FieldContents"
android:text="cwshort" android:text="short"
android:tag="Title" android:tag="Title"
/> />
<RadioButton <RadioButton