From 5cdecb80b91eaf4c3b14ab823a7d6055e2c6f837 Mon Sep 17 00:00:00 2001
From: Steve Elliott <steell@google.com>
Date: Wed, 10 Jun 2020 12:04:55 -0400
Subject: [PATCH] Prevent swipe-to-dismiss conversation header

Fixes: 157712434
Test: manual
Change-Id: I2115216555b94f63518c25a1e382bef84d2447ff
---
 .../notification/stack/NotificationStackScrollLayout.java       | 2 +-
 .../systemui/statusbar/notification/stack/PeopleHubView.kt      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 325c8c0e506a9..f6aca9491ee4e 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
@@ -6538,7 +6538,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
             return row.canViewBeDismissed();
         }
         if (v instanceof PeopleHubView) {
-            return true;
+            return ((PeopleHubView) v).getCanSwipe();
         }
         return false;
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/PeopleHubView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/PeopleHubView.kt
index a1d898fb84b0b..8f77a1d776e46 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/PeopleHubView.kt
+++ b/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) {