From 0ff1ce6075041f74db3651624c4641fbbafdefd4 Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Tue, 5 Apr 2016 18:27:16 -0700 Subject: [PATCH] Changed the default if the notification time is shown By default the notification time is not shown anymore. Bug: 27431551 Change-Id: I68f19450d0de795a51644e939a3fd64366c0abb6 --- core/java/android/app/Notification.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 22562dd290e9a..65e9f109fec04 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -174,6 +174,9 @@ public class Notification implements Parcelable *
  • Notification of an ongoing countdown timer should be stamped with the timer's end time. * * + * 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; @@ -2135,7 +2138,9 @@ public class Notification implements Parcelable if (toAdopt == null) { 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.visibility = VISIBILITY_PRIVATE; } else { @@ -2185,8 +2190,10 @@ public class Notification implements Parcelable /** * 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 */ @@ -2198,6 +2205,8 @@ public class Notification implements Parcelable /** * Control whether the timestamp set with {@link #setWhen(long) setWhen} is shown * 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) { mN.extras.putBoolean(EXTRA_SHOW_WHEN, show);