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

Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev

Browse Source
This commit is contained in:
Daniel Sandler
2012-09-21 07:30:42 -07:00
committed by Android (Google) Code Review
parent 1227233b6f 0c89049ebf
commit 0887711d0f
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -3848,6 +3848,7 @@ package android.app {
method public android.app.Notification.Builder setOnlyAlertOnce(boolean); method public android.app.Notification.Builder setOnlyAlertOnce(boolean);
method public android.app.Notification.Builder setPriority(int); method public android.app.Notification.Builder setPriority(int);
method public android.app.Notification.Builder setProgress(int, int, boolean); method public android.app.Notification.Builder setProgress(int, int, boolean);
method public android.app.Notification.Builder setShowWhen(boolean);
method public android.app.Notification.Builder setSmallIcon(int); method public android.app.Notification.Builder setSmallIcon(int);
method public android.app.Notification.Builder setSmallIcon(int, int); method public android.app.Notification.Builder setSmallIcon(int, int);
method public android.app.Notification.Builder setSound(android.net.Uri); method public android.app.Notification.Builder setSound(android.net.Uri);

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

@@ -951,6 +951,7 @@ public class Notification implements Parcelable
private ArrayList<Action> mActions = new ArrayList<Action>(MAX_ACTION_BUTTONS); private ArrayList<Action> mActions = new ArrayList<Action>(MAX_ACTION_BUTTONS);
private boolean mUseChronometer; private boolean mUseChronometer;
private Style mStyle; private Style mStyle;
private boolean mShowWhen = true;
/** /**
* Constructs a new Builder with the defaults: * Constructs a new Builder with the defaults:
@@ -982,8 +983,9 @@ public class Notification implements Parcelable
/** /**
* Add a timestamp pertaining to the notification (usually the time the event occurred). * Add a timestamp pertaining to the notification (usually the time the event occurred).
* It will be shown in the notification content view by default; use
* {@link Builder#setShowWhen(boolean) setShowWhen} to control this.
* *
* @see Notification#when * @see Notification#when
*/ */
public Builder setWhen(long when) { public Builder setWhen(long when) {
@@ -991,6 +993,15 @@ public class Notification implements Parcelable
return this; return this;
} }
/**
* Control whether the timestamp set with {@link Builder#setWhen(long) setWhen} is shown
* in the content view.
*/
public Builder setShowWhen(boolean show) {
mShowWhen = show;
return this;
}
/** /**
* Show the {@link Notification#when} field as a stopwatch. * Show the {@link Notification#when} field as a stopwatch.
* *
@@ -1467,7 +1478,7 @@ public class Notification implements Parcelable
contentView.setViewPadding(R.id.line1, 0, 0, 0, 0); contentView.setViewPadding(R.id.line1, 0, 0, 0, 0);
} }
if (mWhen != 0) { if (mWhen != 0 && mShowWhen) {
if (mUseChronometer) { if (mUseChronometer) {
contentView.setViewVisibility(R.id.chronometer, View.VISIBLE); contentView.setViewVisibility(R.id.chronometer, View.VISIBLE);
contentView.setLong(R.id.chronometer, "setBase", contentView.setLong(R.id.chronometer, "setBase",
@@ -1477,7 +1488,10 @@ public class Notification implements Parcelable
contentView.setViewVisibility(R.id.time, View.VISIBLE); contentView.setViewVisibility(R.id.time, View.VISIBLE);
contentView.setLong(R.id.time, "setTime", mWhen); contentView.setLong(R.id.time, "setTime", mWhen);
} }
} else {
contentView.setViewVisibility(R.id.time, View.GONE);
} }
contentView.setViewVisibility(R.id.line3, showLine3 ? View.VISIBLE : View.GONE); contentView.setViewVisibility(R.id.line3, showLine3 ? View.VISIBLE : View.GONE);
contentView.setViewVisibility(R.id.overflow_divider, showLine3 ? View.VISIBLE : View.GONE); contentView.setViewVisibility(R.id.overflow_divider, showLine3 ? View.VISIBLE : View.GONE);
return contentView; return contentView;