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

Commit d4ce46b1 authored by András Kurucz's avatar András Kurucz Committed by Android (Google) Code Review
Browse files

Merge "[Flexiglass] format notification files" into main

parents d72a0b49 158a1189

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt

+1 −4
Original line number Diff line number Diff line
@@ -417,10 +417,7 @@ fun NotificationStackCutoffGuideline( 
) {

    Spacer(

        modifier =

            modifier

                    .fillMaxWidth()

                    .height(0.dp)

                    .onGloballyPositioned { coordinates ->

            modifier.fillMaxWidth().height(0.dp).onGloballyPositioned { coordinates ->

                val positionY = coordinates.positionInWindow().y

                debugLog(viewModel) { "STACK cutoff onGloballyPositioned: y=$positionY" }

                stackScrollView.setStackCutoff(positionY)

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

+2 −0
Original line number Diff line number Diff line
@@ -70,9 +70,11 @@ class ScrollViewFields { 
    /** send the [syntheticScroll] to the [syntheticScrollConsumer], if present. */

    fun sendSyntheticScroll(syntheticScroll: Float) =

        syntheticScrollConsumer?.accept(syntheticScroll)



    /** send [isCurrentGestureOverscroll] to the [currentGestureOverscrollConsumer], if present. */

    fun sendCurrentGestureOverscroll(isCurrentGestureOverscroll: Boolean) =

        currentGestureOverscrollConsumer?.accept(isCurrentGestureOverscroll)



    /** send the [headsUpHeight] to the [headsUpHeightConsumer], if present. */

    fun sendHeadsUpHeight(headsUpHeight: Float) = headsUpHeightConsumer?.accept(headsUpHeight)

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/view/NotificationScrollView.kt

+2 −0
Original line number Diff line number Diff line
@@ -64,8 +64,10 @@ interface NotificationScrollView { 


    /** Set a consumer for synthetic scroll events */

    fun setSyntheticScrollConsumer(consumer: Consumer<Float>?)



    /** Set a consumer for current gesture overscroll events */

    fun setCurrentGestureOverscrollConsumer(consumer: Consumer<Boolean>?)



    /** Set a consumer for heads up height changed events */

    fun setHeadsUpHeightConsumer(consumer: Consumer<Float>?)