Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 891fba38 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820083

Change-Id: I3e45cb425ab7b2c661e1b130caff40bb4b5d4acd
parents b310abfd e91a027e

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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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) {