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

Merge "Changed the default if the notification time is shown" into nyc-dev

Browse Source
This commit is contained in:
Selim Cinek
2016-04-06 20:48:08 +00:00
committed by Android (Google) Code Review
parent cbc68e5911 0ff1ce6075
commit f2a587b424
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,6 +174,9 @@ public class Notification implements Parcelable
* <li>Notification of an ongoing countdown timer should be stamped with the timer's end time. * <li>Notification of an ongoing countdown timer should be stamped with the timer's end time.
* </ul> * </ul>
* *
* For apps targeting {@link android.os.Build.VERSION_CODES#N} and above, this time is not shown
* anymore by default and must be opted into by using
* {@link android.app.Notification.Builder#setShowWhen(boolean)}
*/ */
public long when; public long when;
@@ -2135,7 +2138,9 @@ public class Notification implements Parcelable
if (toAdopt == null) { if (toAdopt == null) {
mN = new Notification(); mN = new Notification();
mN.extras.putBoolean(EXTRA_SHOW_WHEN, true); if (context.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.N) {
mN.extras.putBoolean(EXTRA_SHOW_WHEN, true);
}
mN.priority = PRIORITY_DEFAULT; mN.priority = PRIORITY_DEFAULT;
mN.visibility = VISIBILITY_PRIVATE; mN.visibility = VISIBILITY_PRIVATE;
} else { } else {
@@ -2185,8 +2190,10 @@ 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 #setShowWhen(boolean) setShowWhen} to control this. * For apps targeting {@link android.os.Build.VERSION_CODES#N} and above, this time is not
* shown anymore by default and must be opted into by using
* {@link android.app.Notification.Builder#setShowWhen(boolean)}
* *
* @see Notification#when * @see Notification#when
*/ */
@@ -2198,6 +2205,8 @@ public class Notification implements Parcelable
/** /**
* Control whether the timestamp set with {@link #setWhen(long) setWhen} is shown * Control whether the timestamp set with {@link #setWhen(long) setWhen} is shown
* in the content view. * in the content view.
* For apps targeting {@link android.os.Build.VERSION_CODES#N} and above, this defaults to
* {@code false}. For earlier apps, the default is {@code true}.
*/ */
public Builder setShowWhen(boolean show) { public Builder setShowWhen(boolean show) {
mN.extras.putBoolean(EXTRA_SHOW_WHEN, show); mN.extras.putBoolean(EXTRA_SHOW_WHEN, show);