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

Commit 31c78cad authored by András Kurucz's avatar András Kurucz
Browse files

[Flexiglass] Remove the extraneous HUN placeholder from the LS 

HeadsUpNotificationPlaceholder was included twice on the Lockscreen when
bypass was unabled. This lead to a crash, because the LS scene was
trying to compose the same shared element twice.

This CL removes the extra definition for HeadsUpNotificationPlaceholder,
because the Notification section already contains one, which we can use
on the bypass LS.

Fixes: 432246432
Test: Unlock the device with face auth bypass
Test: Receive a HUN on the bypass LS
Flag: com.android.systemui.scene_container
Change-Id: I7bafd4f81df4d7f786d87cd5a8807ba2a93cf55a
parent c737b4ef

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt

+0 −8
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import com.android.systemui.keyguard.ui.composable.LockscreenTouchHandling 
import com.android.systemui.keyguard.ui.composable.element.AmbientIndicationElement

import com.android.systemui.keyguard.ui.composable.element.AodPromotedNotificationAreaElement

import com.android.systemui.keyguard.ui.composable.element.DateAndWeatherElement

import com.android.systemui.keyguard.ui.composable.element.HeadsUpNotificationsElement

import com.android.systemui.keyguard.ui.composable.element.IndicationAreaElement

import com.android.systemui.keyguard.ui.composable.element.LargeClockElement

import com.android.systemui.keyguard.ui.composable.element.LockElement
@@ -56,7 +55,6 @@ constructor( 
    private val shortcutElement: ShortcutElement,

    private val indicationAreaElement: IndicationAreaElement,

    private val settingsMenuElement: SettingsMenuElement,

    private val headsUpNotificationsElement: HeadsUpNotificationsElement,

    private val notificationsElement: NotificationElement,

    private val aodPromotedNotificationAreaElement: AodPromotedNotificationAreaElement,

    private val smallClockElement: SmallClockElement,
@@ -71,12 +69,6 @@ constructor( 


    @Composable

    override fun ContentScope.Content(viewModel: LockscreenContentViewModel, modifier: Modifier) {

        val isBypassEnabled = viewModel.isBypassEnabled



        if (isBypassEnabled) {

            with(headsUpNotificationsElement) { HeadsUpNotifications() }

        }



        LockscreenTouchHandling(

            viewModelFactory = viewModel.touchHandlingFactory,

            modifier = modifier,