Merge "[Status Bar] Remove remaining pipeline classes from ktfmt_includes." into udc-qpr-dev (2427c53a) · Commits · e / os / android_frameworks_base

packages/SystemUI/ktfmt_includes.txt

+0 −4

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -19,12 +19,10 @@ package com.android.systemui.statusbar.pipeline.dagger
	import android.net.wifi.WifiManager		import android.net.wifi.WifiManager
	import com.android.systemui.CoreStartable		import com.android.systemui.CoreStartable
	import com.android.systemui.dagger.SysUISingleton		import com.android.systemui.dagger.SysUISingleton
			import com.android.systemui.log.LogBuffer
	import com.android.systemui.log.LogBufferFactory		import com.android.systemui.log.LogBufferFactory
	import com.android.systemui.log.table.TableLogBuffer		import com.android.systemui.log.table.TableLogBuffer
	import com.android.systemui.log.table.TableLogBufferFactory		import com.android.systemui.log.table.TableLogBufferFactory
	import com.android.systemui.log.LogBuffer
	import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.CollapsedStatusBarViewModel
	import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.CollapsedStatusBarViewModelImpl
	import com.android.systemui.statusbar.pipeline.airplane.data.repository.AirplaneModeRepository		import com.android.systemui.statusbar.pipeline.airplane.data.repository.AirplaneModeRepository
	import com.android.systemui.statusbar.pipeline.airplane.data.repository.AirplaneModeRepositoryImpl		import com.android.systemui.statusbar.pipeline.airplane.data.repository.AirplaneModeRepositoryImpl
	import com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel.AirplaneModeViewModel		import com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel.AirplaneModeViewModel
	@@ -46,6 +44,8 @@ import com.android.systemui.statusbar.pipeline.shared.data.repository.Connectivi
	import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepositoryImpl		import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepositoryImpl
	import com.android.systemui.statusbar.pipeline.shared.ui.binder.CollapsedStatusBarViewBinder		import com.android.systemui.statusbar.pipeline.shared.ui.binder.CollapsedStatusBarViewBinder
	import com.android.systemui.statusbar.pipeline.shared.ui.binder.CollapsedStatusBarViewBinderImpl		import com.android.systemui.statusbar.pipeline.shared.ui.binder.CollapsedStatusBarViewBinderImpl
			import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.CollapsedStatusBarViewModel
			import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.CollapsedStatusBarViewModelImpl
	import com.android.systemui.statusbar.pipeline.wifi.data.repository.RealWifiRepository		import com.android.systemui.statusbar.pipeline.wifi.data.repository.RealWifiRepository
	import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository		import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository
	import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepositorySwitcher		import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepositorySwitcher
	@@ -58,9 +58,9 @@ import dagger.Module
	import dagger.Provides		import dagger.Provides
	import dagger.multibindings.ClassKey		import dagger.multibindings.ClassKey
	import dagger.multibindings.IntoMap		import dagger.multibindings.IntoMap
	import kotlinx.coroutines.flow.Flow
	import java.util.function.Supplier		import java.util.function.Supplier
	import javax.inject.Named		import javax.inject.Named
			import kotlinx.coroutines.flow.Flow

	@Module		@Module
	abstract class StatusBarPipelineModule {		abstract class StatusBarPipelineModule {

Original line number	Original line	Diff line number	Diff line
	@@ -422,9 +422,6 @@
	-packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallFlags.kt		-packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallFlags.kt
	-packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallLogger.kt		-packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallLogger.kt
	-packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherContainer.kt		-packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherContainer.kt
	-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt
	-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/data/model/ConnectivitySlots.kt
	-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiView.kt
	-packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryStateNotifier.kt		-packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryStateNotifier.kt
	-packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsController.kt		-packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsController.kt
	-packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImpl.kt		-packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImpl.kt
	@@ -696,7 +693,6 @@
	-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallChronometerTest.kt		-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallChronometerTest.kt
	-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerTest.kt		-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerTest.kt
	-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallLoggerTest.kt		-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallLoggerTest.kt
	-packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModelTest.kt
	-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BatteryStateNotifierTest.kt		-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BatteryStateNotifierTest.kt
	-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/ClockTest.kt		-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/ClockTest.kt
	-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImplTest.kt		-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImplTest.kt