Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-10 19:21:57 +00:00
committed by Android (Google) Code Review
parent 613b829a5b 5cdecb80b9
commit e91a027e67
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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