Merge "ktfmt classes affected by recent @ShadeDisplayAware refactors" into main (25260b2e) · Commits · e / os / android_frameworks_base

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

+4 −7

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@ constructor(
		)
		}
		}
		},
		}
		)
		}
		}
		@@ -173,7 +173,7 @@ constructor(
		areNotificationsVisible: Boolean,
		isShadeLayoutWide: Boolean,
		burnInParams: BurnInParameters?,
		modifier: Modifier = Modifier
		modifier: Modifier = Modifier,
		) {
		if (!areNotificationsVisible) {
		return
		@@ -193,10 +193,7 @@ constructor(
		if (burnInParams == null) {
		it
		} else {
		it.burnInAware(
		viewModel = aodBurnInViewModel,
		params = burnInParams,
		)
		it.burnInAware(viewModel = aodBurnInViewModel, params = burnInParams)
		}
		},
		)

+0 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,6 @@ package com.android.systemui.common.data

		import com.android.systemui.common.data.repository.PackageChangeRepository
		import com.android.systemui.common.data.repository.PackageChangeRepositoryImpl
		import com.android.systemui.common.ui.data.repository.ConfigurationRepository
		import com.android.systemui.common.ui.data.repository.ConfigurationRepositoryImpl
		import dagger.Binds
		import dagger.Module

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.systemui.common.ui

		import android.content.Context
		import com.android.systemui.common.ui.data.repository.ConfigurationRepositoryModule
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.statusbar.policy.ConfigurationController

+4 −3

Original line number	Diff line number	Diff line
		@@ -134,7 +134,8 @@ constructor(
		maxDisplayMode.physicalWidth,
		maxDisplayMode.physicalHeight,
		displayInfo.value.naturalWidth,
		displayInfo.value.naturalHeight)
		displayInfo.value.naturalHeight,
		)
		return if (scaleFactor == Float.POSITIVE_INFINITY) 1f else scaleFactor
		}
		return 1f
		@@ -148,7 +149,7 @@ constructor(
		interface Factory {
		fun create(
		context: Context,
		configurationController: ConfigurationController
		configurationController: ConfigurationController,
		): ConfigurationRepositoryImpl
		}
		}
		@@ -174,7 +175,7 @@ abstract class ConfigurationRepositoryModule {
		fun provideGlobalConfigRepository(
		context: Context,
		@GlobalConfig configurationController: ConfigurationController,
		factory: ConfigurationRepositoryImpl.Factory
		factory: ConfigurationRepositoryImpl.Factory,
		): ConfigurationRepository {
		return factory.create(context, configurationController)
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.os.Bundle
		import android.view.View
		import androidx.annotation.VisibleForTesting
		import androidx.asynclayoutinflater.view.AsyncLayoutInflater
		import com.android.app.tracing.coroutines.launchTraced as launch
		import com.android.settingslib.applications.InterestingConfigChanges
		import com.android.systemui.Dumpable
		import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractor
		@@ -57,7 +58,6 @@ import kotlinx.coroutines.flow.filterNotNull
		import kotlinx.coroutines.flow.map
		import kotlinx.coroutines.flow.stateIn
		import kotlinx.coroutines.flow.update
		import com.android.app.tracing.coroutines.launchTraced as launch
		import kotlinx.coroutines.withContext

		// TODO(307945185) Split View concerns into a ViewBinder