Merge "Remove test flakiness" into sc-v2-dev

This commit is contained in:
Lucas Dupin
2021-12-07 22:41:11 +00:00
committed by Android (Google) Code Review

View File

@@ -6,6 +6,7 @@ import android.testing.TestableLooper
import android.testing.TestableLooper.RunWithLooper import android.testing.TestableLooper.RunWithLooper
import android.util.DisplayMetrics import android.util.DisplayMetrics
import com.android.systemui.ExpandHelper import com.android.systemui.ExpandHelper
import com.android.systemui.R
import com.android.systemui.SysuiTestCase import com.android.systemui.SysuiTestCase
import com.android.systemui.classifier.FalsingCollector import com.android.systemui.classifier.FalsingCollector
import com.android.systemui.media.MediaHierarchyManager import com.android.systemui.media.MediaHierarchyManager
@@ -81,6 +82,8 @@ class LockscreenShadeTransitionControllerTest : SysuiTestCase() {
mDependency, mDependency,
TestableLooper.get(this)) TestableLooper.get(this))
row = helper.createRow() row = helper.createRow()
context.getOrCreateTestableResources()
.addOverride(R.bool.config_use_split_notification_shade, false)
transitionController = LockscreenShadeTransitionController( transitionController = LockscreenShadeTransitionController(
statusBarStateController = statusbarStateController, statusBarStateController = statusbarStateController,
lockscreenGestureLogger = lockscreenGestureLogger, lockscreenGestureLogger = lockscreenGestureLogger,