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

am f4699efb: Merge "Possibly fix bad notification updates." into honeycomb

Browse Source 
* commit 'f4699efb635dc7695e346343e9b9024ed225a612':
  Possibly fix bad notification updates.
This commit is contained in:
Joe Onorato
2011-01-12 17:09:06 -08:00
committed by Android Git Automerger
parent b0b43c5f56 f4699efb63
commit d1e3d232ed
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
public String toString() {
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) {
int N = this.vibrate.length-1;
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
// didn't change.
boolean orderUnchanged = (notification.notification.when == oldNotification.notification.when
&& notification.isOngoing() == oldNotification.isOngoing()
boolean contentsUnchanged = notification.isOngoing() == oldNotification.isOngoing()
&& oldEntry.expanded != null
&& contentView != null
&& oldContentView != null
&& contentView.getPackage() != null
&& oldContentView.getPackage() != null
&& oldContentView.getPackage().equals(contentView.getPackage())
&& oldContentView.getLayoutId() == contentView.getLayoutId());
&& oldContentView.getLayoutId() == contentView.getLayoutId();
ViewGroup rowParent = (ViewGroup) oldEntry.row.getParent();
boolean isLastAnyway = rowParent.indexOfChild(oldEntry.row) == rowParent.getChildCount() - 1;
if (orderUnchanged || isLastAnyway) {
boolean orderUnchanged = notification.notification.when==oldNotification.notification.when;
boolean isLastAnyway = rowParent.indexOfChild(oldEntry.row) == rowParent.getChildCount()-1;
if (contentsUnchanged && (orderUnchanged || isLastAnyway)) {
if (DEBUG) Slog.d(TAG, "reusing notification for key: " + key);
oldEntry.notification = notification;
try {

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

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