am 074b54fb: Merge "Maybe fix issue #6756472: Share button is not defocusing the shade" into jb-dev

* commit '074b54fbc0b6254c0ba308e0cf2e86c1cc929348':
  Maybe fix issue #6756472: Share button is not defocusing the shade

1 files changed, 4 insertions, 6 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index ec99513..1204a89 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -577,11 +577,9 @@ public abstract class BaseStatusBar extends SystemUI implements
         View expandedLarge = null;
         Exception exception = null;
         try {
-            oneU.setOnClickHandler(mOnClickHandler);
-            expandedOneU = oneU.apply(mContext, adaptive);
+            expandedOneU = oneU.apply(mContext, adaptive, mOnClickHandler);
             if (large != null) {
-                large.setOnClickHandler(mOnClickHandler);
-                expandedLarge = large.apply(mContext, adaptive);
+                expandedLarge = large.apply(mContext, adaptive, mOnClickHandler);
             }
         }
         catch (RuntimeException e) {
@@ -872,9 +870,9 @@ public abstract class BaseStatusBar extends SystemUI implements
             oldEntry.notification = notification;
             try {
                 // Reapply the RemoteViews
-                contentView.reapply(mContext, oldEntry.expanded);
+                contentView.reapply(mContext, oldEntry.expanded, mOnClickHandler);
                 if (bigContentView != null && oldEntry.getLargeView() != null) {
-                    bigContentView.reapply(mContext, oldEntry.getLargeView());
+                    bigContentView.reapply(mContext, oldEntry.getLargeView(), mOnClickHandler);
                 }
                 // update the contentIntent
                 final PendingIntent contentIntent = notification.notification.contentIntent;