commit 10113a7c36838cb7da6b36e7f4800d6cfae6178d
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 14 21:11:12 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 14 21:11:12 2018 +0000
tree 223c5094594e62eb8d4d45983a43ff57d24d82b1
parent f866003a22da1bc90e746f47a27e1b871467b03f
parent 50e3899a4c84ac5d0fa84b05edb4d565bf42ef08

Merge "Links right-to-left dismiss to feature flag."

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

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 7bd58203..a7329b0 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
@@ -5786,7 +5786,13 @@
 
         @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);
         }
     };