Merge "Prevent swipe-to-dismiss conversation header" into rvc-dev

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

@@ -6539,7 +6539,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
             return row.canViewBeDismissed();
         }
         if (v instanceof PeopleHubView) {
-            return true;
+            return ((PeopleHubView) v).getCanSwipe();
         }
         return false;
     }

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/PeopleHubView.kt

@@ -72,7 +72,7 @@ class PeopleHubView(context: Context, attrs: AttributeSet) :
         }
     }
 
-    var canSwipe: Boolean = true
+    var canSwipe: Boolean = false
         set(value) {
             if (field != value) {
                 if (field) {