From 50e3899a4c84ac5d0fa84b05edb4d565bf42ef08 Mon Sep 17 00:00:00 2001
From: Gus Prevas <kprevas@google.com>
Date: Wed, 14 Nov 2018 10:33:44 -0500
Subject: Links right-to-left dismiss to feature flag.

This change re-enables dismissing a notification via a right-to-left
swipe unless the new interruption model flag is turned on.

Bug: 116622974
Change-Id: Id70692e5edb1bf36f758639c6d65a14feb2675ca
Fixes: 119482546
Test: manually
---
 .../notification/stack/NotificationStackScrollLayout.java         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
index 9daba83e0b36..bcf949f4ff69 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
@@ -5796,7 +5796,13 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
 
         @Override
         public boolean canChildBeDismissedInDirection(View v, boolean isRightOrDown) {
-            return (isLayoutRtl() ? !isRightOrDown : isRightOrDown) && canChildBeDismissed(v);
+            boolean isValidDirection;
+            if (NotificationUtils.useNewInterruptionModel(mContext)) {
+                isValidDirection = isLayoutRtl() ? !isRightOrDown : isRightOrDown;
+            } else {
+                isValidDirection = true;
+            }
+            return isValidDirection && canChildBeDismissed(v);
         }
     };
 
-- 
cgit v1.2.3-59-g8ed1b