Merge "Clean up legacy code in lockscreen controller/view model" into main (7eee58f2) · Commits · e / os / android_frameworks_base

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

+0 −23

Original line number	Diff line number	Diff line
		@@ -16,18 +16,14 @@

		package com.android.systemui.keyguard.ui.viewmodel

		import android.content.res.Resources
		import androidx.compose.runtime.getValue
		import androidx.compose.ui.Alignment
		import com.android.app.tracing.coroutines.launchTraced as launch
		import com.android.systemui.biometrics.AuthController
		import com.android.systemui.customization.clocks.R as clocksR
		import com.android.systemui.deviceentry.domain.interactor.DeviceEntryBypassInteractor
		import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor
		import com.android.systemui.keyguard.domain.interactor.KeyguardBlueprintInteractor
		import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor
		import com.android.systemui.keyguard.shared.model.ClockSize
		import com.android.systemui.keyguard.shared.model.ClockSizeSetting
		import com.android.systemui.keyguard.shared.model.KeyguardState
		import com.android.systemui.keyguard.shared.transition.KeyguardTransitionAnimationCallback
		@@ -37,7 +33,6 @@ import com.android.systemui.keyguard.ui.composable.layout.UnfoldTranslations
		import com.android.systemui.lifecycle.ExclusiveActivatable
		import com.android.systemui.lifecycle.Hydrator
		import com.android.systemui.plugins.clocks.ClockController
		import com.android.systemui.res.R
		import com.android.systemui.shade.domain.interactor.ShadeModeInteractor
		import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor
		import com.android.systemui.unfold.domain.interactor.UnfoldTransitionInteractor
		@@ -189,24 +184,6 @@ constructor(
		}
		}

		fun getSmartSpacePaddingTop(resources: Resources): Int {
		return if (clockInteractor.clockSize.value == ClockSize.LARGE) {
		resources.getDimensionPixelSize(clocksR.dimen.keyguard_smartspace_top_offset) +
		resources.getDimensionPixelSize(R.dimen.keyguard_clock_top_margin)
		} else {
		0
		}
		}

		/** Where to place the notifications stack on the lockscreen. */
		sealed interface NotificationsPlacement {
		/** Show notifications below the lockscreen clock. */
		data object BelowClock : NotificationsPlacement

		/** Show notifications side-by-side with the clock. */
		data class BesideClock(val alignment: Alignment) : NotificationsPlacement
		}

		@AssistedFactory
		interface Factory {
		fun create(

packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt

+2 −8

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ class LockscreenSmartspaceController
		@Inject
		constructor(
		@ShadeDisplayAware private val context: Context,
		private val featureFlags: FeatureFlags,
		featureFlags: FeatureFlags,
		private val activityStarter: ActivityStarter,
		private val falsingManager: FalsingManager,
		private val systemClock: SystemClock,
		@@ -101,7 +101,7 @@ constructor(
		private val bypassController: KeyguardBypassController,
		private val keyguardUpdateMonitor: KeyguardUpdateMonitor,
		private val smartspaceViewModelFactory: SmartspaceViewModel.Factory,
		private val dumpManager: DumpManager,
		dumpManager: DumpManager,
		private val execution: Execution,
		@Main private val uiExecutor: Executor,
		@Background private val bgExecutor: Executor,
		@@ -133,7 +133,6 @@ constructor(
		private var regionSamplers = mutableMapOf<SmartspaceView, RegionSampler>()

		private val regionSamplingEnabled = featureFlags.isEnabled(Flags.REGION_SAMPLING)
		private var isRegionSamplersCreated = false
		private var showNotifications = false
		private var showSensitiveContentForCurrentUser = false
		private var showSensitiveContentForManagedUser = false
		@@ -515,11 +514,6 @@ constructor(
		reloadSmartspace()
		}

		fun setSplitShadeEnabled(enabled: Boolean) {
		mSplitShadeEnabled = enabled
		smartspaceViews.forEach { it.setSplitShadeEnabled(enabled) }
		}

		/** Requests the smartspace session for an update. */
		fun requestSmartspaceUpdate() {
		session?.requestSmartspaceUpdate()