Merge "Re-register dumpables for Region Sampler" into tm-qpr-dev (d59d23f8) · Commits · e / os / android_frameworks_base

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

+21 −1

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

		/** Dump region sampler */
		fun dump(pw: PrintWriter) {
		regionSampler?.dump(pw)
		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!!))}"
		)
		// TODO(b/265969235): mock initialSampling based on if component is on HS or LS wallpaper
		// HS Smartspace - wallpaperManager?.getWallpaperColors(WallpaperManager.FLAG_SYSTEM)
		// LS Smartspace, clock - wallpaperManager?.getWallpaperColors(WallpaperManager.FLAG_LOCK)
		pw.println(
		"initialSampling for lockscreen: " +
		"${wallpaperManager?.getWallpaperColors(WallpaperManager.FLAG_LOCK)}"
		)
		}

		fun calculateSampledRegion(sampledView: View): RectF {

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

+13 −1

Original line number	Diff line number	Diff line
		@@ -38,10 +38,12 @@ import android.view.View
		import android.view.ViewGroup
		import com.android.keyguard.KeyguardUpdateMonitor
		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
		@@ -62,6 +64,7 @@ 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.time.Instant
		import java.util.Optional
		import java.util.concurrent.Executor
		@@ -86,6 +89,7 @@ constructor(
		private val deviceProvisionedController: DeviceProvisionedController,
		private val bypassController: KeyguardBypassController,
		private val keyguardUpdateMonitor: KeyguardUpdateMonitor,
		private val dumpManager: DumpManager,
		private val execution: Execution,
		@Main private val uiExecutor: Executor,
		@Background private val bgExecutor: Executor,
		@@ -96,7 +100,7 @@ constructor(
		optionalWeatherPlugin: Optional<BcSmartspaceDataPlugin>,
		optionalPlugin: Optional<BcSmartspaceDataPlugin>,
		optionalConfigPlugin: Optional<BcSmartspaceConfigPlugin>,
		) {
		) : Dumpable {
		companion object {
		private const val TAG = "LockscreenSmartspaceController"
		}
		@@ -230,6 +234,7 @@ constructor(

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

		fun isEnabled(): Boolean {
		@@ -543,4 +548,11 @@ 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/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt

+5 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import android.widget.FrameLayout
		import androidx.test.filters.SmallTest
		import com.android.keyguard.KeyguardUpdateMonitor
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.plugins.ActivityStarter
		@@ -128,6 +129,9 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() {
		@Mock
		private lateinit var configPlugin: BcSmartspaceConfigPlugin

		@Mock
		private lateinit var dumpManager: DumpManager

		@Mock
		private lateinit var controllerListener: SmartspaceTargetListener

		@@ -228,6 +232,7 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() {
		deviceProvisionedController,
		keyguardBypassController,
		keyguardUpdateMonitor,
		dumpManager,
		execution,
		executor,
		bgExecutor,