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

Commit d4d13a13 authored by Aaron Liu's avatar Aaron Liu
Browse files

Remove legacy lock icon in compose LS 

The legacy lock icon view was not being removed. So we see it in the top
left of the screen.

Fixes: 326286248
Test: open compose lockscreen.
Flag: ACONFIG com.android.systemui.compose_lockscreen DEVELOPMENT

Change-Id: Ia34c1539d500dd33ab7cd112643b364cefea9c55
parent 230a6ecb

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/LockSection.kt

+7 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.keyguard.ui.composable.section 


import android.content.Context

import android.util.DisplayMetrics

import android.view.View

import android.view.WindowManager

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier
@@ -45,6 +46,7 @@ import com.android.systemui.keyguard.ui.viewmodel.DeviceEntryForegroundViewModel 
import com.android.systemui.keyguard.ui.viewmodel.DeviceEntryIconViewModel

import com.android.systemui.plugins.FalsingManager

import com.android.systemui.res.R

import com.android.systemui.shade.NotificationPanelView

import com.android.systemui.statusbar.VibratorHelper

import dagger.Lazy

import javax.inject.Inject
@@ -63,6 +65,7 @@ constructor( 
    private val deviceEntryBackgroundViewModel: Lazy<DeviceEntryBackgroundViewModel>,

    private val falsingManager: Lazy<FalsingManager>,

    private val vibratorHelper: Lazy<VibratorHelper>,

    private val notificationPanelView: NotificationPanelView,

) {

    @Composable

    fun SceneScope.LockIcon(modifier: Modifier = Modifier) {
@@ -70,6 +73,10 @@ constructor( 
            return

        }



        notificationPanelView.findViewById<View?>(R.id.lock_icon_view)?.let {

            notificationPanelView.removeView(it)

        }



        val context = LocalContext.current



        AndroidView(