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

Commit 174327ea authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Use adapter's sensistivity" into main

parents 60d96ddb b2ddf497

packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt

+4 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.systemui.shade.domain.interactor.ShadeLockscreenInteractor 
import com.android.systemui.statusbar.notification.collection.NotificationEntry

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow

import com.android.systemui.statusbar.notification.row.ExpandableView

import com.android.systemui.statusbar.notification.shared.NotificationBundleUi

import com.android.systemui.statusbar.notification.stack.AmbientState

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController

import com.android.systemui.statusbar.phone.CentralSurfaces
@@ -391,7 +392,9 @@ constructor( 
            }

            if (view is ExpandableNotificationRow) {

                // Only drag down on sensitive views, otherwise the ExpandHelper will take this

                return view.entry.isSensitive.value

                return if (NotificationBundleUi.isEnabled)

                    view.entryAdapter?.isSensitive?.value == true

                else view.entry.isSensitive.value

            }

        }

        return false