Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Moves dump one level up for ClockEventController." into tm-qpr-dev

Browse Source
This commit is contained in:
Ale Nijamkin
2023-01-29 18:27:55 +00:00
committed by Android (Google) Code Review
parent 6dc0d33dea 62df49271f
commit ad84af50f6
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/keyguard/ClockEventController.kt
View File

@@ -54,7 +54,6 @@ import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import java.io.PrintWriter
import java.util.Locale import java.util.Locale
import java.util.TimeZone import java.util.TimeZone
import java.util.concurrent.Executor import java.util.concurrent.Executor
@@ -309,15 +308,6 @@ open class ClockEventController @Inject constructor(
resources.getDimensionPixelSize(R.dimen.large_clock_text_size).toFloat()) 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 @VisibleForTesting
internal fun listenForDozeAmount(scope: CoroutineScope): Job { internal fun listenForDozeAmount(scope: CoroutineScope): Job {
return scope.launch { return scope.launch {

5
packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
View File

@@ -45,6 +45,7 @@ import com.android.systemui.plugins.log.LogBuffer;
import com.android.systemui.plugins.log.LogLevel; import com.android.systemui.plugins.log.LogLevel;
import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.shared.clocks.ClockRegistry; 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.lockscreen.LockscreenSmartspaceController;
import com.android.systemui.statusbar.notification.AnimatableProperty; import com.android.systemui.statusbar.notification.AnimatableProperty;
import com.android.systemui.statusbar.notification.PropertyAnimator; import com.android.systemui.statusbar.notification.PropertyAnimator;
@@ -445,6 +446,10 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
if (clock != null) { if (clock != null) {
clock.dump(pw); clock.dump(pw);
} }
final RegionSampler regionSampler = mClockEventController.getRegionSampler();
if (regionSampler != null) {
regionSampler.dump(pw);
}
} }
/** Gets the animations for the current clock. */ /** Gets the animations for the current clock. */

8
packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt
View File

@@ -15,7 +15,6 @@
*/ */
package com.android.keyguard package com.android.keyguard
import com.android.systemui.statusbar.CommandQueue
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.testing.AndroidTestingRunner import android.testing.AndroidTestingRunner
import android.view.View 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.ClockFaceController
import com.android.systemui.plugins.ClockFaceEvents import com.android.systemui.plugins.ClockFaceEvents
import com.android.systemui.plugins.log.LogBuffer 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.BatteryController
import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.statusbar.policy.ConfigurationController
import com.android.systemui.util.mockito.any 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.capture
import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.eq
import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.mock
import java.util.TimeZone
import java.util.concurrent.Executor
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.yield import kotlinx.coroutines.yield
@@ -57,8 +55,10 @@ import org.mockito.Mock
import org.mockito.Mockito.never import org.mockito.Mockito.never
import org.mockito.Mockito.times import org.mockito.Mockito.times
import org.mockito.Mockito.verify import org.mockito.Mockito.verify
import org.mockito.Mockito.`when` as whenever
import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoJUnit
import java.util.*
import java.util.concurrent.Executor
import org.mockito.Mockito.`when` as whenever
@RunWith(AndroidTestingRunner::class) @RunWith(AndroidTestingRunner::class)
@SmallTest @SmallTest