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

Commit 428f7119 authored by Beverly's avatar Beverly
Browse files

Hookup occluding app device entry message to show chipbar 

Test: manually enable flag and running fp over occluding apps,
see chipbar on fp failures & help messages on occluding
apps over the lockscreen
Bug: 283260970
Fixes: 288308594

Change-Id: I7b329ef9f3e27c3c37c82d21454020a95c131b22
parent 4dc8eacf

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt

+17 −0
Original line number Diff line number Diff line
@@ -25,19 +25,24 @@ import com.android.systemui.dagger.SysUISingleton 
import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.keyguard.ui.binder.KeyguardIndicationAreaBinder

import com.android.systemui.keyguard.ui.binder.KeyguardRootViewBinder

import com.android.systemui.keyguard.ui.view.KeyguardRootView

import com.android.systemui.keyguard.ui.view.layout.KeyguardLayoutManager

import com.android.systemui.keyguard.ui.view.layout.KeyguardLayoutManagerCommandListener

import com.android.systemui.keyguard.ui.viewmodel.KeyguardIndicationAreaViewModel

import com.android.systemui.keyguard.ui.viewmodel.OccludingAppDeviceEntryMessageViewModel

import com.android.systemui.shade.NotificationShadeWindowView

import com.android.systemui.statusbar.KeyguardIndicationController

import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer

import com.android.systemui.statusbar.notification.stack.ui.viewbinder.SharedNotificationContainerBinder

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.SharedNotificationContainerViewModel

import com.android.systemui.temporarydisplay.chipbar.ChipbarCoordinator

import javax.inject.Inject

import kotlinx.coroutines.DisposableHandle

import kotlinx.coroutines.ExperimentalCoroutinesApi



/** Binds keyguard views on startup, and also exposes methods to allow rebinding if views change */

@ExperimentalCoroutinesApi

@SysUISingleton

class KeyguardViewConfigurator

@Inject
@@ -51,11 +56,14 @@ constructor( 
    private val indicationController: KeyguardIndicationController,

    private val keyguardLayoutManager: KeyguardLayoutManager,

    private val keyguardLayoutManagerCommandListener: KeyguardLayoutManagerCommandListener,

    private val occludingAppDeviceEntryMessageViewModel: OccludingAppDeviceEntryMessageViewModel,

    private val chipbarCoordinator: ChipbarCoordinator,

) : CoreStartable {



    private var indicationAreaHandle: DisposableHandle? = null



    override fun start() {

        bindKeyguardRootView()

        val notificationPanel =

            notificationShadeWindowView.requireViewById(R.id.notification_panel) as ViewGroup

        bindIndicationArea(notificationPanel)
@@ -116,4 +124,13 @@ constructor( 
            }

        }

    }



    private fun bindKeyguardRootView() {

        KeyguardRootViewBinder.bind(

            keyguardRootView,

            featureFlags,

            occludingAppDeviceEntryMessageViewModel,

            chipbarCoordinator,

        )

    }

}

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt

0 → 100644
+93 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.keyguard.ui.binder



import android.annotation.DrawableRes

import android.view.ViewGroup

import androidx.lifecycle.Lifecycle

import androidx.lifecycle.repeatOnLifecycle

import com.android.systemui.R

import com.android.systemui.common.shared.model.Icon

import com.android.systemui.common.shared.model.Text

import com.android.systemui.common.shared.model.TintedIcon

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.keyguard.ui.viewmodel.OccludingAppDeviceEntryMessageViewModel

import com.android.systemui.lifecycle.repeatWhenAttached

import com.android.systemui.temporarydisplay.ViewPriority

import com.android.systemui.temporarydisplay.chipbar.ChipbarCoordinator

import com.android.systemui.temporarydisplay.chipbar.ChipbarInfo

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.launch



/** Bind occludingAppDeviceEntryMessageViewModel to run whenever the keyguard view is attached. */

@ExperimentalCoroutinesApi

object KeyguardRootViewBinder {

    @JvmStatic

    fun bind(

        view: ViewGroup,

        featureFlags: FeatureFlags,

        occludingAppDeviceEntryMessageViewModel: OccludingAppDeviceEntryMessageViewModel,

        chipbarCoordinator: ChipbarCoordinator,

    ) {

        if (featureFlags.isEnabled(Flags.FP_LISTEN_OCCLUDING_APPS)) {

            view.repeatWhenAttached {

                repeatOnLifecycle(Lifecycle.State.CREATED) {

                    launch {

                        occludingAppDeviceEntryMessageViewModel.message.collect { biometricMessage

                            ->

                            if (biometricMessage?.message != null) {

                                chipbarCoordinator.displayView(

                                    createChipbarInfo(

                                        biometricMessage.message,

                                        R.drawable.ic_lock,

                                    )

                                )

                            } else {

                                chipbarCoordinator.removeView(ID, "occludingAppMsgNull")

                            }

                        }

                    }

                }

            }

        }

    }



    /**

     * Creates an instance of [ChipbarInfo] that can be sent to [ChipbarCoordinator] for display.

     */

    private fun createChipbarInfo(message: String, @DrawableRes icon: Int): ChipbarInfo {

        return ChipbarInfo(

            startIcon =

                TintedIcon(

                    Icon.Resource(icon, null),

                    ChipbarInfo.DEFAULT_ICON_TINT,

                ),

            text = Text.Loaded(message),

            endItem = null,

            vibrationEffect = null,

            windowTitle = "OccludingAppUnlockMsgChip",

            wakeReason = "OCCLUDING_APP_UNLOCK_MSG_CHIP",

            timeoutMs = 3500,

            id = ID,

            priority = ViewPriority.CRITICAL,

            instanceId = null,

        )

    }



    private const val ID = "occluding_app_device_entry_unlock_msg"

}

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/OccludingAppDeviceEntryMessageViewModel.kt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 */



package com.android.systemui.keyguard.ui.viewmodel



import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.keyguard.domain.interactor.BiometricMessage

import com.android.systemui.keyguard.domain.interactor.OccludingAppDeviceEntryInteractor

import javax.inject.Inject

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.Flow



/** Shows authentication messages over occcluding apps over the lockscreen. */

@ExperimentalCoroutinesApi

@SysUISingleton

class OccludingAppDeviceEntryMessageViewModel

@Inject

constructor(

    interactor: OccludingAppDeviceEntryInteractor,

) {

    val message: Flow<BiometricMessage?> = interactor.message

}