diff options
2 files changed, 8 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java index 93166f39ad62..73bb6cd9ba1c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java @@ -287,7 +287,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView mGroupExpansionChanging = true; final boolean wasExpanded = mGroupExpansionManager.isGroupExpanded(mEntry); boolean nowExpanded = mGroupExpansionManager.toggleGroupExpansion(mEntry); - mOnExpandClickListener.onExpandClicked(mEntry, nowExpanded); + mOnExpandClickListener.onExpandClicked(mEntry, v, nowExpanded); MetricsLogger.action(mContext, MetricsEvent.ACTION_NOTIFICATION_GROUP_EXPANDER, nowExpanded); onExpansionChanged(true /* userAction */, wasExpanded); @@ -310,7 +310,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView setUserExpanded(nowExpanded); } notifyHeightChanged(true); - mOnExpandClickListener.onExpandClicked(mEntry, nowExpanded); + mOnExpandClickListener.onExpandClicked(mEntry, v, nowExpanded); MetricsLogger.action(mContext, MetricsEvent.ACTION_NOTIFICATION_EXPANDER, nowExpanded); } @@ -3064,7 +3064,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView } public interface OnExpandClickListener { - void onExpandClicked(NotificationEntry clickedEntry, boolean nowExpanded); + void onExpandClicked(NotificationEntry clickedEntry, View clickedView, boolean nowExpanded); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java index aa58527cb32e..47deb1f0084b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java @@ -24,12 +24,14 @@ import android.app.KeyguardManager; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.SystemClock; import android.service.notification.NotificationListenerService; import android.service.notification.StatusBarNotification; import android.service.vr.IVrManager; import android.service.vr.IVrStateCallbacks; import android.util.Log; import android.util.Slog; +import android.view.View; import android.view.accessibility.AccessibilityManager; import android.widget.TextView; @@ -394,8 +396,10 @@ public class StatusBarNotificationPresenter implements NotificationPresenter, } @Override - public void onExpandClicked(NotificationEntry clickedEntry, boolean nowExpanded) { + public void onExpandClicked(NotificationEntry clickedEntry, View clickedView, + boolean nowExpanded) { mHeadsUpManager.setExpanded(clickedEntry, nowExpanded); + mStatusBar.wakeUpIfDozing(SystemClock.uptimeMillis(), clickedView, "NOTIFICATION_CLICK"); if (nowExpanded) { if (mStatusBarStateController.getState() == StatusBarState.KEYGUARD) { mShadeTransitionController.goToLockedShade(clickedEntry.getRow()); |