Consolidate ConfigurationInteractor (94ca052b) · Commits · e / os / android_frameworks_base

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) }

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ import com.android.systemui.bouncer.ui.BouncerViewModule;
		import com.android.systemui.classifier.FalsingModule;
		import com.android.systemui.clipboardoverlay.dagger.ClipboardOverlayModule;
		import com.android.systemui.common.data.CommonDataLayerModule;
		import com.android.systemui.common.domain.CommonDomainLayerModule;
		import com.android.systemui.communal.dagger.CommunalModule;
		import com.android.systemui.complication.dagger.ComplicationComponent;
		import com.android.systemui.controls.dagger.ControlsModule;
		@@ -179,7 +178,6 @@ import javax.inject.Named;
		ClockRegistryModule.class,
		CommunalModule.class,
		CommonDataLayerModule.class,
		CommonDomainLayerModule.class,
		ConnectivityModule.class,
		ControlsModule.class,
		CoroutinesModule.class,

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/domain/interactor/HideNotificationsInteractor.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package com.android.systemui.statusbar.notification.stack.domain.interactor
		import android.graphics.Rect
		import android.util.Log
		import com.android.app.tracing.FlowTracing.traceEach
		import com.android.systemui.common.domain.interactor.ConfigurationInteractor
		import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.power.domain.interactor.PowerInteractor
		import com.android.systemui.power.shared.model.ScreenPowerState.SCREEN_ON
		@@ -28,6 +28,7 @@ import com.android.systemui.util.kotlin.WithPrev
		import com.android.systemui.util.kotlin.area
		import com.android.systemui.util.kotlin.pairwise
		import com.android.systemui.util.kotlin.race
		import javax.inject.Inject
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.TimeoutCancellationException
		import kotlinx.coroutines.flow.Flow
		@@ -38,7 +39,6 @@ import kotlinx.coroutines.flow.first
		import kotlinx.coroutines.flow.flatMapLatest
		import kotlinx.coroutines.flow.flow
		import kotlinx.coroutines.withTimeout
		import javax.inject.Inject

		@OptIn(ExperimentalCoroutinesApi::class)
		@SysUISingleton