diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-01-24 05:15:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-24 05:15:44 +0000 |
| commit | 21d7f24efaa2723d0d6cf576df6c7265c4070a5e (patch) | |
| tree | 7644645335b3fd9e252281cb8b16b96525cb7c57 /core/java | |
| parent | 5b47a78ec55eb3aca5397655f6d06761292ef38c (diff) | |
| parent | 4dfd4324437c8a57e11887839b2b30d081ede3bf (diff) | |
Merge changes Idd092c44,I85f7686e
* changes:
Indication area alignment in AOD
Fix alignment of ambient notificaiton
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/Notification.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 2e3b8af80428..d6fddfca986e 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -4130,7 +4130,7 @@ public class Notification implements Parcelable final Bundle ex = mN.extras; updateBackgroundColor(contentView); bindNotificationHeader(contentView, p.ambient, p.headerTextSecondary); - bindLargeIcon(contentView, p.hideLargeIcon, p.alwaysShowReply); + bindLargeIcon(contentView, p.hideLargeIcon || p.ambient, p.alwaysShowReply); boolean showProgress = handleProgressBar(p.hasProgress, contentView, ex); if (p.title != null) { contentView.setViewVisibility(R.id.title, View.VISIBLE); |