PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable flag ENABLE_SPLIT_LAUNCH_DATA_REFACTOR am: b33a2e0762

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22958378

Change-Id: I531376aed5701fe63b40bd3f7749683d06f9889b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vinit Nayak
2023-05-09 09:08:02 +00:00
committed by Automerger Merge Worker
parent cd35372a2e b33a2e0762
commit cd2b6baef4
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/tests/src/com/android/quickstep/util/SplitSelectStateControllerTest.kt
+3 -4
View File
@@ -33,14 +33,10 @@ import com.android.launcher3.statehandlers.DepthController
import com.android.launcher3.statemanager.StateManager import com.android.launcher3.statemanager.StateManager
import com.android.launcher3.util.ComponentKey import com.android.launcher3.util.ComponentKey
import com.android.launcher3.util.SplitConfigurationOptions import com.android.launcher3.util.SplitConfigurationOptions
import com.android.launcher3.util.SplitConfigurationOptions.StagePosition
import com.android.launcher3.util.mock
import com.android.launcher3.util.withArgCaptor import com.android.launcher3.util.withArgCaptor
import com.android.quickstep.RecentsModel import com.android.quickstep.RecentsModel
import com.android.quickstep.SystemUiProxy import com.android.quickstep.SystemUiProxy
import com.android.systemui.shared.recents.model.Task import com.android.systemui.shared.recents.model.Task
import java.util.ArrayList
import java.util.function.Consumer
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse import org.junit.Assert.assertFalse
import org.junit.Assert.assertNull import org.junit.Assert.assertNull
@@ -50,7 +46,9 @@ import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mockito.Mock import org.mockito.Mock
import org.mockito.Mockito.verify import org.mockito.Mockito.verify
import org.mockito.Mockito.`when`
import org.mockito.MockitoAnnotations import org.mockito.MockitoAnnotations
import java.util.function.Consumer
@RunWith(AndroidJUnit4::class) @RunWith(AndroidJUnit4::class)
class SplitSelectStateControllerTest { class SplitSelectStateControllerTest {
@@ -355,6 +353,7 @@ class SplitSelectStateControllerTest {
@Test @Test
fun secondPendingIntentSet() { fun secondPendingIntentSet() {
val itemInfo = ItemInfo() val itemInfo = ItemInfo()
`when`(pendingIntent.creatorUserHandle).thenReturn(primaryUserHandle)
splitSelectStateController.setInitialTaskSelect(null, 0, itemInfo, null, 1) splitSelectStateController.setInitialTaskSelect(null, 0, itemInfo, null, 1)
splitSelectStateController.setSecondTask(pendingIntent) splitSelectStateController.setSecondTask(pendingIntent)
assertTrue(splitSelectStateController.isBothSplitAppsConfirmed) assertTrue(splitSelectStateController.isBothSplitAppsConfirmed)
src/com/android/launcher3/config/FeatureFlags.java
+1 -1
View File
@@ -415,7 +415,7 @@ public final class FeatureFlags {
// TODO(Block 31) // TODO(Block 31)
public static final BooleanFlag ENABLE_SPLIT_LAUNCH_DATA_REFACTOR = getDebugFlag(279494325, public static final BooleanFlag ENABLE_SPLIT_LAUNCH_DATA_REFACTOR = getDebugFlag(279494325,
"ENABLE_SPLIT_LAUNCH_DATA_REFACTOR", DISABLED, "ENABLE_SPLIT_LAUNCH_DATA_REFACTOR", ENABLED,
"Use refactored split launching code path"); "Use refactored split launching code path");
// TODO(Block 32): Empty block // TODO(Block 32): Empty block