drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bf0e106a: Merge "Cleanups in Notification.java." into jb-mr1.1-dev

Browse Source 
* commit 'bf0e106a7d755355d7ff53a2b319e2e91c154641':
  Cleanups in Notification.java.
This commit is contained in:
Daniel Sandler
2012-11-27 18:41:01 -08:00
committed by Android Git Automerger
parent 70f1782298 bf0e106a7d
commit 6684a2ce1a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -388,8 +388,8 @@ public class Notification implements Parcelable
* Priority is an indication of how much of the user's valuable attention should be consumed by * Priority is an indication of how much of the user's valuable attention should be consumed by
* this notification. Low-priority notifications may be hidden from the user in certain * this notification. Low-priority notifications may be hidden from the user in certain
* situations, while the user might be interrupted for a higher-priority notification. The * situations, while the user might be interrupted for a higher-priority notification. The
* system will make a determination about how to interpret notification priority as described in * system will make a determination about how to interpret this priority when presenting
* MUMBLE MUMBLE. * the notification.
*/ */
public int priority; public int priority;
@ -846,7 +846,9 @@ public class Notification implements Parcelable
} }
// TODO(dsandler): defaults take precedence over local values, so reorder the branches below // TODO(dsandler): defaults take precedence over local values, so reorder the branches below
sb.append(" vibrate="); sb.append(" vibrate=");
if (this.vibrate != null) { if ((this.defaults & DEFAULT_VIBRATE) != 0) {
sb.append("default");
} else if (this.vibrate != null) {
int N = this.vibrate.length-1; int N = this.vibrate.length-1;
sb.append("["); sb.append("[");
for (int i=0; i<N; i++) { for (int i=0; i<N; i++) {
@ -857,16 +859,14 @@ public class Notification implements Parcelable
sb.append(this.vibrate[N]); sb.append(this.vibrate[N]);
} }
sb.append("]"); sb.append("]");
} else if ((this.defaults & DEFAULT_VIBRATE) != 0) {
sb.append("default");
} else { } else {
sb.append("null"); sb.append("null");
} }
sb.append(" sound="); sb.append(" sound=");
if (this.sound != null) { if ((this.defaults & DEFAULT_SOUND) != 0) {
sb.append(this.sound.toString());
} else if ((this.defaults & DEFAULT_SOUND) != 0) {
sb.append("default"); sb.append("default");
} else if (this.sound != null) {
sb.append(this.sound.toString());
} else { } else {
sb.append("null"); sb.append("null");
} }