Merge "Revert "Register Dumpables for Region Sampler"" into tm-qpr-dev (292dc384) · Commits · e / os / android_frameworks_base

packages/SystemUI/shared/src/com/android/systemui/shared/regionsampling/RegionSampler.kt

+1 −19

Original line number	Diff line number	Diff line
		@@ -114,25 +114,7 @@ constructor(

		/** Dump region sampler */
		fun dump(pw: PrintWriter) {
		pw.println("[RegionSampler]")
		pw.println("regionSamplingEnabled: $regionSamplingEnabled")
		pw.println("regionDarkness: $regionDarkness")
		pw.println("lightForegroundColor: ${Integer.toHexString(lightForegroundColor)}")
		pw.println("darkForegroundColor:${Integer.toHexString(darkForegroundColor)}")
		pw.println("passed-in sampledView: $sampledView")
		pw.println("calculated samplingBounds: $samplingBounds")
		pw.println(
		"sampledView width: ${sampledView?.width}, sampledView height: ${sampledView?.height}"
		)
		pw.println("screen width: ${displaySize.x}, screen height: ${displaySize.y}")
		pw.println(
		"sampledRegionWithOffset: ${convertBounds(calculateSampledRegion(sampledView!!))}"
		)
		pw.println(
		"initialSampling for lockscreen: " +
		"${wallpaperManager?.getWallpaperColors(WallpaperManager.FLAG_LOCK)}"
		)
		// TODO(b/265969235): add initialSampling dump for HS smartspace
		regionSampler?.dump(pw)
		}

		fun calculateSampledRegion(sampledView: View): RectF {

packages/SystemUI/src/com/android/keyguard/ClockEventController.kt

+3 −8

Original line number	Diff line number	Diff line
		@@ -28,12 +28,10 @@ import android.widget.FrameLayout
		import androidx.annotation.VisibleForTesting
		import androidx.lifecycle.Lifecycle
		import androidx.lifecycle.repeatOnLifecycle
		import com.android.systemui.Dumpable
		import com.android.systemui.R
		import com.android.systemui.broadcast.BroadcastDispatcher
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags.DOZING_MIGRATION_1
		import com.android.systemui.flags.Flags.REGION_SAMPLING
		@@ -79,9 +77,8 @@ open class ClockEventController @Inject constructor(
		@Background private val bgExecutor: Executor,
		@KeyguardSmallClockLog private val smallLogBuffer: LogBuffer?,
		@KeyguardLargeClockLog private val largeLogBuffer: LogBuffer?,
		private val featureFlags: FeatureFlags,
		private val dumpManager: DumpManager
		) : Dumpable {
		private val featureFlags: FeatureFlags
		) {
		var clock: ClockController? = null
		set(value) {
		field = value
		@@ -278,7 +275,6 @@ open class ClockEventController @Inject constructor(
		configurationController.addCallback(configListener)
		batteryController.addCallback(batteryCallback)
		keyguardUpdateMonitor.registerCallback(keyguardUpdateMonitorCallback)
		dumpManager.registerDumpable(this)
		disposableHandle = parent.repeatWhenAttached {
		repeatOnLifecycle(Lifecycle.State.STARTED) {
		listenForDozing(this)
		@@ -304,7 +300,6 @@ open class ClockEventController @Inject constructor(
		batteryController.removeCallback(batteryCallback)
		keyguardUpdateMonitor.removeCallback(keyguardUpdateMonitorCallback)
		regionSampler?.stopRegionSampler()
		dumpManager.unregisterDumpable(javaClass.simpleName)
		}

		private fun updateFontSizes() {
		@@ -317,7 +312,7 @@ open class ClockEventController @Inject constructor(
		/**
		* Dump information for debugging
		*/
		override fun dump(pw: PrintWriter, args: Array<out String>) {
		fun dump(pw: PrintWriter) {
		pw.println(this)
		clock?.dump(pw)
		regionSampler?.dump(pw)

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

+4 −14

Original line number	Diff line number	Diff line
		@@ -36,12 +36,10 @@ import android.view.ContextThemeWrapper
		import android.view.View
		import android.view.ViewGroup
		import com.android.settingslib.Utils
		import com.android.systemui.Dumpable
		import com.android.systemui.R
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.plugins.ActivityStarter
		@@ -59,14 +57,15 @@ import com.android.systemui.statusbar.policy.ConfigurationController
		import com.android.systemui.statusbar.policy.DeviceProvisionedController
		import com.android.systemui.util.concurrency.Execution
		import com.android.systemui.util.settings.SecureSettings
		import java.io.PrintWriter
		import java.util.Optional
		import java.util.concurrent.Executor
		import javax.inject.Inject

		/** Controller for managing the smartspace view on the lockscreen */
		@SysUISingleton
		class LockscreenSmartspaceController @Inject constructor(
		class LockscreenSmartspaceController
		@Inject
		constructor(
		private val context: Context,
		private val featureFlags: FeatureFlags,
		private val smartspaceManager: SmartspaceManager,
		@@ -79,14 +78,13 @@ class LockscreenSmartspaceController @Inject constructor(
		private val statusBarStateController: StatusBarStateController,
		private val deviceProvisionedController: DeviceProvisionedController,
		private val bypassController: KeyguardBypassController,
		private val dumpManager: DumpManager,
		private val execution: Execution,
		@Main private val uiExecutor: Executor,
		@Background private val bgExecutor: Executor,
		@Main private val handler: Handler,
		optionalPlugin: Optional<BcSmartspaceDataPlugin>,
		optionalConfigPlugin: Optional<BcSmartspaceConfigPlugin>,
		) : Dumpable {
		) {
		companion object {
		private const val TAG = "LockscreenSmartspaceController"
		}
		@@ -203,7 +201,6 @@ class LockscreenSmartspaceController @Inject constructor(

		init {
		deviceProvisionedController.addCallback(deviceProvisionedListener)
		dumpManager.registerDumpable(this)
		}

		fun isEnabled(): Boolean {
		@@ -444,11 +441,4 @@ class LockscreenSmartspaceController @Inject constructor(
		}
		return null
		}

		override fun dump(pw: PrintWriter, args: Array<out String>) {
		pw.println("Region Samplers: ${regionSamplers.size}")
		regionSamplers.map { (_, sampler) ->
		sampler.dump(pw)
		}
		}
		}

packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt

+1 −4

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.widget.TextView
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.broadcast.BroadcastDispatcher
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository
		import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository
		@@ -87,7 +86,6 @@ class ClockEventControllerTest : SysuiTestCase() {
		@Mock private lateinit var smallLogBuffer: LogBuffer
		@Mock private lateinit var largeLogBuffer: LogBuffer
		private lateinit var underTest: ClockEventController
		@Mock private lateinit var dumpManager: DumpManager

		@Before
		fun setUp() {
		@@ -115,8 +113,7 @@ class ClockEventControllerTest : SysuiTestCase() {
		bgExecutor,
		smallLogBuffer,
		largeLogBuffer,
		featureFlags,
		dumpManager
		featureFlags
		)
		underTest.clock = clock

packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt

+0 −5

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ import android.view.View
		import android.widget.FrameLayout
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.plugins.ActivityStarter
		import com.android.systemui.plugins.BcSmartspaceConfigPlugin
		@@ -118,9 +117,6 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() {
		@Mock
		private lateinit var configPlugin: BcSmartspaceConfigPlugin

		@Mock
		private lateinit var dumpManager: DumpManager

		@Mock
		private lateinit var controllerListener: SmartspaceTargetListener

		@@ -210,7 +206,6 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() {
		statusBarStateController,
		deviceProvisionedController,
		keyguardBypassController,
		dumpManager,
		execution,
		executor,
		bgExecutor,