mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-04 18:06:48 +00:00
Merge "Disable model loading with Sandbox check instead of static boolean." into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
791944ff63
@@ -29,7 +29,6 @@ import com.android.launcher3.taskbar.TaskbarActivityContext
|
||||
import com.android.launcher3.taskbar.TaskbarControllers
|
||||
import com.android.launcher3.taskbar.TaskbarManager
|
||||
import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarNavButtonCallbacks
|
||||
import com.android.launcher3.taskbar.TaskbarViewController
|
||||
import com.android.launcher3.taskbar.bubbles.BubbleControllers
|
||||
import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController
|
||||
import com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR
|
||||
@@ -130,15 +129,12 @@ class TaskbarUnitTestRule(
|
||||
}
|
||||
|
||||
try {
|
||||
TaskbarViewController.enableModelLoadingForTests(false)
|
||||
|
||||
// Required to complete initialization.
|
||||
instrumentation.runOnMainSync { taskbarManager.onUserUnlocked() }
|
||||
|
||||
base.evaluate()
|
||||
} finally {
|
||||
instrumentation.runOnMainSync { taskbarManager.destroy() }
|
||||
TaskbarViewController.enableModelLoadingForTests(true)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user