Merge "Moves dump one level up for ClockEventController." into tm-qpr-dev (ad84af50) · Commits · e / os / android_frameworks_base

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -54,7 +54,6 @@ import kotlinx.coroutines.Job
		import kotlinx.coroutines.flow.combine
		import kotlinx.coroutines.flow.filter
		import kotlinx.coroutines.launch
		import java.io.PrintWriter
		import java.util.Locale
		import java.util.TimeZone
		import java.util.concurrent.Executor
		@@ -309,15 +308,6 @@ open class ClockEventController @Inject constructor(
		resources.getDimensionPixelSize(R.dimen.large_clock_text_size).toFloat())
		}

		/**
		* Dump information for debugging
		*/
		fun dump(pw: PrintWriter) {
		pw.println(this)
		clock?.dump(pw)
		regionSampler?.dump(pw)
		}

		@VisibleForTesting
		internal fun listenForDozeAmount(scope: CoroutineScope): Job {
		return scope.launch {

+5 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ import com.android.systemui.plugins.log.LogBuffer;
		import com.android.systemui.plugins.log.LogLevel;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.shared.clocks.ClockRegistry;
		import com.android.systemui.shared.regionsampling.RegionSampler;
		import com.android.systemui.statusbar.lockscreen.LockscreenSmartspaceController;
		import com.android.systemui.statusbar.notification.AnimatableProperty;
		import com.android.systemui.statusbar.notification.PropertyAnimator;
		@@ -445,6 +446,10 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
		if (clock != null) {
		clock.dump(pw);
		}
		final RegionSampler regionSampler = mClockEventController.getRegionSampler();
		if (regionSampler != null) {
		regionSampler.dump(pw);
		}
		}

		/** Gets the animations for the current clock. */

+4 −4

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		*/
		package com.android.keyguard

		import com.android.systemui.statusbar.CommandQueue
		import android.content.BroadcastReceiver
		import android.testing.AndroidTestingRunner
		import android.view.View
		@@ -34,6 +33,7 @@ import com.android.systemui.plugins.ClockEvents
		import com.android.systemui.plugins.ClockFaceController
		import com.android.systemui.plugins.ClockFaceEvents
		import com.android.systemui.plugins.log.LogBuffer
		import com.android.systemui.statusbar.CommandQueue
		import com.android.systemui.statusbar.policy.BatteryController
		import com.android.systemui.statusbar.policy.ConfigurationController
		import com.android.systemui.util.mockito.any
		@@ -41,8 +41,6 @@ import com.android.systemui.util.mockito.argumentCaptor
		import com.android.systemui.util.mockito.capture
		import com.android.systemui.util.mockito.eq
		import com.android.systemui.util.mockito.mock
		import java.util.TimeZone
		import java.util.concurrent.Executor
		import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.runBlocking
		import kotlinx.coroutines.yield
		@@ -57,8 +55,10 @@ import org.mockito.Mock
		import org.mockito.Mockito.never
		import org.mockito.Mockito.times
		import org.mockito.Mockito.verify
		import org.mockito.Mockito.`when` as whenever
		import org.mockito.junit.MockitoJUnit
		import java.util.*
		import java.util.concurrent.Executor
		import org.mockito.Mockito.`when` as whenever

		@RunWith(AndroidTestingRunner::class)
		@SmallTest