Merge "Update vis of deviceEntry longpress view based on icon's visibility" into main (11e2ad66) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.content.res.ColorStateList
		import android.util.StateSet
		import android.view.HapticFeedbackConstants
		import android.view.View
		import androidx.core.view.isInvisible
		import androidx.lifecycle.Lifecycle
		import androidx.lifecycle.repeatOnLifecycle
		import com.android.systemui.common.ui.view.LongPressHandlingView
		@@ -81,6 +82,11 @@ object DeviceEntryIconViewBinder {
		// GONE => AOD transition (even though the view may not be visible until the middle
		// of the transition.
		repeatOnLifecycle(Lifecycle.State.CREATED) {
		launch {
		viewModel.isVisible.collect { isVisible ->
		longPressHandlingView.isInvisible = !isVisible
		}
		}
		launch {
		viewModel.isLongPressEnabled.collect { isEnabled ->
		longPressHandlingView.setLongPressHandlingEnabled(isEnabled)

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.delay
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.combine
		import kotlinx.coroutines.flow.distinctUntilChanged
		import kotlinx.coroutines.flow.flatMapLatest
		import kotlinx.coroutines.flow.flow
		import kotlinx.coroutines.flow.flowOf
		@@ -206,6 +207,7 @@ constructor(
		DeviceEntryIconView.IconType.LOCK
		}
		}
		val isVisible: Flow<Boolean> = deviceEntryViewAlpha.map { it > 0f }.distinctUntilChanged()
		val isLongPressEnabled: Flow<Boolean> =
		combine(
		iconType,
		@@ -217,6 +219,7 @@ constructor(
		DeviceEntryIconView.IconType.FINGERPRINT -> false
		}
		}

		val accessibilityDelegateHint: Flow<DeviceEntryIconView.AccessibilityHintType> =
		combine(iconType, isLongPressEnabled) { deviceEntryStatus, longPressEnabled ->
		if (longPressEnabled) {

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

0 → 100644

+110 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 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 androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.biometrics.data.repository.FakeFingerprintPropertyRepository
		import com.android.systemui.biometrics.data.repository.fingerprintPropertyRepository
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.keyguard.data.repository.FakeDeviceEntryFingerprintAuthRepository
		import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository
		import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFingerprintAuthRepository
		import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository
		import com.android.systemui.keyguard.data.repository.keyguardRepository
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlin.test.Test
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.test.runTest
		import org.junit.Before
		import org.junit.runner.RunWith

		@ExperimentalCoroutinesApi
		@SmallTest
		@RunWith(AndroidJUnit4::class)
		class DeviceEntryIconViewModelTest : SysuiTestCase() {
		private val kosmos = testKosmos()
		private val testScope = kosmos.testScope
		private lateinit var keyguardRepository: FakeKeyguardRepository
		private lateinit var fingerprintPropertyRepository: FakeFingerprintPropertyRepository
		private lateinit var fingerprintAuthRepository: FakeDeviceEntryFingerprintAuthRepository
		private lateinit var deviceEntryIconTransition: FakeDeviceEntryIconTransition
		private lateinit var underTest: DeviceEntryIconViewModel

		@Before
		fun setUp() {
		keyguardRepository = kosmos.fakeKeyguardRepository
		fingerprintPropertyRepository = kosmos.fingerprintPropertyRepository
		fingerprintAuthRepository = kosmos.fakeDeviceEntryFingerprintAuthRepository
		deviceEntryIconTransition = kosmos.fakeDeviceEntryIconViewModelTransition
		underTest = kosmos.deviceEntryIconViewModel
		}

		@Test
		fun isLongPressEnabled_udfpsRunning() =
		testScope.runTest {
		val isLongPressEnabled by collectLastValue(underTest.isLongPressEnabled)
		fingerprintPropertyRepository.supportsUdfps()
		fingerprintAuthRepository.setIsRunning(true)
		keyguardRepository.setKeyguardDismissible(false)
		assertThat(isLongPressEnabled).isFalse()
		}

		@Test
		fun isLongPressEnabled_unlocked() =
		testScope.runTest {
		val isLongPressEnabled by collectLastValue(underTest.isLongPressEnabled)
		keyguardRepository.setKeyguardDismissible(true)
		assertThat(isLongPressEnabled).isTrue()
		}

		@Test
		fun isLongPressEnabled_lock() =
		testScope.runTest {
		val isLongPressEnabled by collectLastValue(underTest.isLongPressEnabled)
		keyguardRepository.setKeyguardDismissible(false)

		// udfps supported
		fingerprintPropertyRepository.supportsUdfps()
		assertThat(isLongPressEnabled).isTrue()

		// udfps isn't supported
		fingerprintPropertyRepository.supportsRearFps()
		assertThat(isLongPressEnabled).isFalse()
		}

		@Test
		fun isVisible() =
		testScope.runTest {
		val isVisible by collectLastValue(underTest.isVisible)
		deviceEntryIconTransitionAlpha(1f)
		assertThat(isVisible).isTrue()

		deviceEntryIconTransitionAlpha(0f)
		assertThat(isVisible).isFalse()

		deviceEntryIconTransitionAlpha(.5f)
		assertThat(isVisible).isTrue()
		}

		private fun deviceEntryIconTransitionAlpha(alpha: Float) {
		deviceEntryIconTransition.setDeviceEntryParentViewAlpha(alpha)
		}
		}