Merge "Revert "Register Dumpables for Region Sampler"" into tm-qpr-dev am: 292dc38434
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21119599
Change-Id: Ica89639c862e58cdeda1482413e699a1e974ee3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/regionsampling/RegionSampler.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/regionsampling/RegionSampler.kt
index 0cbf1db..ef2247f 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/regionsampling/RegionSampler.kt
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/regionsampling/RegionSampler.kt
@@ -114,25 +114,7 @@
/** 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 {
diff --git a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt
index b1ce54e..1680b47 100644
--- a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt
+++ b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt
@@ -28,12 +28,10 @@
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 @@
@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 @@
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 @@
batteryController.removeCallback(batteryCallback)
keyguardUpdateMonitor.removeCallback(keyguardUpdateMonitorCallback)
regionSampler?.stopRegionSampler()
- dumpManager.unregisterDumpable(javaClass.simpleName)
}
private fun updateFontSizes() {
@@ -317,7 +312,7 @@
/**
* 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)
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt
index ff2392e..665b1bc 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt
@@ -36,12 +36,10 @@
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.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 @@
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 @@
init {
deviceProvisionedController.addCallback(deviceProvisionedListener)
- dumpManager.registerDumpable(this)
}
fun isEnabled(): Boolean {
@@ -444,11 +441,4 @@
}
return null
}
-
- override fun dump(pw: PrintWriter, args: Array<out String>) {
- pw.println("Region Samplers: ${regionSamplers.size}")
- regionSamplers.map { (_, sampler) ->
- sampler.dump(pw)
- }
- }
}
diff --git a/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt b/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt
index dbedba0..00b2fbe 100644
--- a/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt
@@ -23,7 +23,6 @@
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 @@
@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 @@
bgExecutor,
smallLogBuffer,
largeLogBuffer,
- featureFlags,
- dumpManager
+ featureFlags
)
underTest.clock = clock
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt
index cd6778e..43b6e41 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt
@@ -33,7 +33,6 @@
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
@@ -119,9 +118,6 @@
private lateinit var configPlugin: BcSmartspaceConfigPlugin
@Mock
- private lateinit var dumpManager: DumpManager
-
- @Mock
private lateinit var controllerListener: SmartspaceTargetListener
@Captor
@@ -210,7 +206,6 @@
statusBarStateController,
deviceProvisionedController,
keyguardBypassController,
- dumpManager,
execution,
executor,
bgExecutor,