From 7210947e0d0e384fc34d61160c99adc2f36734e0 Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Fri, 15 Jan 2016 16:33:22 -0800 Subject: [PATCH] Handling content intent of groups correctly Content intent of children in groups can now only be launched if the group is expanded. Bug: 26582343 Change-Id: I5bf2c853d7659b4c764892409c6c7cc3fc647cc8 --- .../systemui/statusbar/ExpandableNotificationRow.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java index 45c5cfb5c15a8..52e6a9c2caf76 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java @@ -317,6 +317,16 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { updateNoBackgroundState(); } + @Override + public boolean onTouchEvent(MotionEvent event) { + if (event.getActionMasked() != MotionEvent.ACTION_DOWN + || !isChildInGroup() || isGroupExpanded()) { + return super.onTouchEvent(event); + } else { + return false; + } + } + @Override protected boolean shouldHideBackground() { return super.shouldHideBackground() || mShowNoBackground;