diff options
| author | Selim Cinek <cinek@google.com> | 2017-07-23 12:57:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-23 12:57:19 +0000 |
| commit | 3a82a4a0f213952d88180fc21ec705018681312e (patch) | |
| tree | 6707d35107e2578e17c962cc5307102c4a047017 /core/java/android/app/Notification.java | |
| parent | e3f6e69af107738fad1b477a860616d6f5e045b1 (diff) | |
| parent | 8650c7c0f1181764f24d7b6e9e0514c9180f3ad0 (diff) | |
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
am: 8650c7c0f1
Change-Id: I10d7ab191f47bf167a5be5e0d11d7698aae58cd1
Diffstat (limited to 'core/java/android/app/Notification.java')
| -rw-r--r-- | core/java/android/app/Notification.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index f4277ce3917e..a218274481a0 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -4563,11 +4563,16 @@ public class Notification implements Parcelable savedBundle.getBoolean(EXTRA_SHOW_CHRONOMETER)); publicExtras.putBoolean(EXTRA_CHRONOMETER_COUNT_DOWN, savedBundle.getBoolean(EXTRA_CHRONOMETER_COUNT_DOWN)); - publicExtras.putCharSequence(EXTRA_TITLE, - mContext.getString(com.android.internal.R.string.notification_hidden_text)); mN.extras = publicExtras; - final RemoteViews view = ambient ? makeAmbientNotification() - : applyStandardTemplate(getBaseLayoutResource()); + RemoteViews view; + if (ambient) { + publicExtras.putCharSequence(EXTRA_TITLE, + mContext.getString(com.android.internal.R.string.notification_hidden_text)); + view = makeAmbientNotification(); + } else{ + view = makeNotificationHeader(false /* ambient */); + view.setBoolean(R.id.notification_header, "setExpandOnlyOnButton", true); + } mN.extras = savedBundle; mN.mLargeIcon = largeIcon; mN.largeIcon = largeIconLegacy; |