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

Commit 7c93d36c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Flexiglass] Remove the extraneous HUN placeholder from the LS" into main

parents 8c87b0f9 31c78cad
Loading
Loading
Loading
Loading
+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,