Merge changes from topic "udfps_padding_calc_update" into main (31aa2121) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/dimens.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -1905,4 +1905,7 @@
		<!-- Bouncer user switcher margins -->
		<dimen name="bouncer_user_switcher_view_mode_user_switcher_bottom_margin">0dp</dimen>
		<dimen name="bouncer_user_switcher_view_mode_view_flipper_bottom_margin">0dp</dimen>

		<!-- UDFPS view attributes -->
		<dimen name="udfps_icon_size">6mm</dimen>
		</resources>

packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/UdfpsOverlayInteractor.kt

+14 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.systemui.biometrics.domain.interactor

		import android.content.Context
		import android.view.MotionEvent
		import com.android.systemui.biometrics.AuthController
		import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams
		@@ -23,12 +24,15 @@ import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLoggin
		import com.android.systemui.common.coroutine.ConflatedCallbackFlow
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.res.R
		import com.android.systemui.user.domain.interactor.SelectedUserInteractor
		import javax.inject.Inject
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.channels.awaitClose
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.SharingStarted
		import kotlinx.coroutines.flow.StateFlow
		import kotlinx.coroutines.flow.map
		import kotlinx.coroutines.flow.stateIn

		/** Encapsulates business logic for interacting with the UDFPS overlay. */
		@@ -36,10 +40,12 @@ import kotlinx.coroutines.flow.stateIn
		class UdfpsOverlayInteractor
		@Inject
		constructor(
		@Application context: Context,
		private val authController: AuthController,
		private val selectedUserInteractor: SelectedUserInteractor,
		@Application scope: CoroutineScope
		) {
		private val iconSize: Int = context.resources.getDimensionPixelSize(R.dimen.udfps_icon_size)

		/** Whether a touch is within the under-display fingerprint sensor area */
		fun isTouchWithinUdfpsArea(ev: MotionEvent): Boolean {
		@@ -70,6 +76,14 @@ constructor(
		}
		.stateIn(scope, started = SharingStarted.Eagerly, initialValue = UdfpsOverlayParams())

		// Padding between the fingerprint icon and its bounding box in pixels.
		val iconPadding: Flow<Int> =
		udfpsOverlayParams.map { params ->
		val sensorWidth = params.nativeSensorBounds.right - params.nativeSensorBounds.left
		val nativePadding = (sensorWidth - iconSize) / 2
		(nativePadding * params.scaleFactor).toInt()
		}

		companion object {
		private const val TAG = "UdfpsOverlayInteractor"
		}

packages/SystemUI/src/com/android/systemui/common/domain/CommonDomainLayerModule.kt

deleted100644 → 0

+0 −27

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.common.domain

		import com.android.systemui.common.domain.interactor.ConfigurationInteractor
		import com.android.systemui.common.domain.interactor.ConfigurationInteractorImpl
		import dagger.Binds
		import dagger.Module

		@Module
		abstract class CommonDomainLayerModule {
		@Binds abstract fun bindInteractor(impl: ConfigurationInteractorImpl): ConfigurationInteractor
		}

packages/SystemUI/src/com/android/systemui/common/domain/interactor/ConfigurationInteractor.kt

deleted100644 → 0

+0 −57

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.common.domain.interactor

		import android.content.res.Configuration
		import android.graphics.Rect
		import android.view.Surface
		import com.android.systemui.common.ui.data.repository.ConfigurationRepository
		import javax.inject.Inject
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.distinctUntilChanged
		import kotlinx.coroutines.flow.map

		interface ConfigurationInteractor {
		/**
		* Returns screen size adjusted to rotation, so returned screen sizes are stable across all
		* rotations, could be useful if you need to react to screen resize (e.g. fold/unfold on
		* foldable devices)
		*/
		val naturalMaxBounds: Flow<Rect>
		}

		class ConfigurationInteractorImpl
		@Inject
		constructor(private val repository: ConfigurationRepository) : ConfigurationInteractor {

		override val naturalMaxBounds: Flow<Rect>
		get() = repository.configurationValues.map { it.naturalScreenBounds }.distinctUntilChanged()

		/**
		* Returns screen size adjusted to rotation, so returned screen size is stable across all
		* rotations
		*/
		private val Configuration.naturalScreenBounds: Rect
		get() {
		val rotation = windowConfiguration.displayRotation
		val maxBounds = windowConfiguration.maxBounds
		return if (rotation == Surface.ROTATION_0 \|\| rotation == Surface.ROTATION_180) {
		Rect(0, 0, maxBounds.width(), maxBounds.height())
		} else {
		Rect(0, 0, maxBounds.height(), maxBounds.width())
		}
		}
		}

packages/SystemUI/src/com/android/systemui/common/ui/domain/interactor/ConfigurationInteractor.kt

+28 −0

Original line number	Diff line number	Diff line
		@@ -17,17 +17,45 @@

		package com.android.systemui.common.ui.domain.interactor

		import android.content.res.Configuration
		import android.graphics.Rect
		import android.view.Surface
		import com.android.systemui.common.ui.data.repository.ConfigurationRepository
		import com.android.systemui.dagger.SysUISingleton
		import javax.inject.Inject
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.distinctUntilChanged
		import kotlinx.coroutines.flow.map
		import kotlinx.coroutines.flow.mapLatest
		import kotlinx.coroutines.flow.onStart

		/** Business logic related to configuration changes. */
		@SysUISingleton
		class ConfigurationInteractor @Inject constructor(private val repository: ConfigurationRepository) {
		/**
		* Returns screen size adjusted to rotation, so returned screen size is stable across all
		* rotations
		*/
		private val Configuration.naturalScreenBounds: Rect
		get() {
		val rotation = windowConfiguration.displayRotation
		val maxBounds = windowConfiguration.maxBounds
		return if (rotation == Surface.ROTATION_0 \|\| rotation == Surface.ROTATION_180) {
		Rect(0, 0, maxBounds.width(), maxBounds.height())
		} else {
		Rect(0, 0, maxBounds.height(), maxBounds.width())
		}
		}

		/**
		* Returns screen size adjusted to rotation, so returned screen sizes are stable across all
		* rotations, could be useful if you need to react to screen resize (e.g. fold/unfold on
		* foldable devices)
		*/
		val naturalMaxBounds: Flow<Rect> =
		repository.configurationValues.map { it.naturalScreenBounds }.distinctUntilChanged()

		/** Given [resourceId], emit the dimension pixel size on config change */
		fun dimensionPixelSize(resourceId: Int): Flow<Int> {
		return onAnyConfigurationChange.mapLatest { repository.getDimensionPixelSize(resourceId) }