diff --git a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt index 669aad4e67..be0af56a06 100644 --- a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt +++ b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt @@ -603,11 +603,19 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl } fun selectDriver(id: String, linux: Boolean) { + if (!linux && id == TurnipDriver.AUTO) { + DriverBundle.selectDisplay(activity, id) + pairModeOpen = false + lastAutoCheck = 0L + setMode(auto = true) + refreshDrivers() + return + } val bundle = DriverBundle.containing(activity, id, linux) when { bundle != null -> useBundle(bundle) linux -> SessionPrefs.setLinuxDriver(activity, id) - else -> SessionPrefs.setAndroidDriver(activity, id) + else -> DriverBundle.selectDisplay(activity, id) } pairModeOpen = false setMode(auto = false, mix = true) diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/DriverBundle.kt b/app/src/main/java/com/droiddeck/launcher/gpu/DriverBundle.kt index 594dbebb27..319a123811 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/DriverBundle.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/DriverBundle.kt @@ -159,6 +159,12 @@ object DriverBundle { SessionPrefs.setLinuxDriver(context, bundle.linuxId) } + fun selectDisplay(context: Context, id: String) { + val left = active(context) + SessionPrefs.setAndroidDriver(context, id) + if (left != null && left.androidId != id) SessionPrefs.setLinuxDriver(context, "") + } + fun remove(context: Context, bundle: Bundle) { TurnipDriver(context).remove(bundle.androidId) LinuxVulkanDriverManager(context).removeDriver(bundle.linuxId) diff --git a/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt index 0e15c04dba..923c1f41fd 100644 --- a/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt @@ -7,6 +7,7 @@ import android.os.Looper import com.droiddeck.launcher.session.QuestExperimental import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.gpu.TpUbwcHint +import com.droiddeck.launcher.gpu.TurnipDriver import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull @@ -34,6 +35,31 @@ class DriverMenusAutoTest { ShadowBuild.setDevice("eureka") } + @Test fun pickingTheAutoDisplayHandsBothHalvesToAuto() { + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + SessionPrefs.setGpuDriverMode(activity, SessionPrefs.GPU_DRIVERS_MIX) + SessionPrefs.setAndroidDriver(activity, "chosen-display") + SessionPrefs.setLinuxDriver(activity, "chosen-linux") + val menus = DriverMenus(activity, Handler(Looper.getMainLooper())) + menus.selectDriver(TurnipDriver.AUTO, linux = false) + assertEquals(SessionPrefs.GPU_DRIVERS_AUTO, SessionPrefs.gpuDriverMode(activity)) + assertEquals(QuestExperimental.DRIVER, SessionPrefs.androidDriver(activity)) + assertEquals("", SessionPrefs.linuxDriver(activity)) + } + + @Test fun pickingTheAutoDisplayWithNoPairForTheGpuStillPutsTheDisplayOnAuto() { + ShadowBuild.setModel("Generic phone") + ShadowBuild.setDevice("generic") + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + SessionPrefs.setGpuDriverMode(activity, SessionPrefs.GPU_DRIVERS_MIX) + SessionPrefs.setAndroidDriver(activity, "chosen-display") + SessionPrefs.setLinuxDriver(activity, "chosen-linux") + DriverMenus(activity, Handler(Looper.getMainLooper())).selectDriver(TurnipDriver.AUTO, linux = false) + assertEquals(SessionPrefs.GPU_DRIVERS_AUTO, SessionPrefs.gpuDriverMode(activity)) + assertEquals(TurnipDriver.AUTO, SessionPrefs.androidDriver(activity)) + assertEquals("chosen-linux", SessionPrefs.linuxDriver(activity)) + } + @Test fun selectingAutoUsesTheQuestPairWithoutStartingADownload() { val activity = Robolectric.buildActivity(Activity::class.java).setup().get() SessionPrefs.setGpuDriverMode(activity, SessionPrefs.GPU_DRIVERS_MANUAL) diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/DriverBundleTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/DriverBundleTest.kt index b9c0ce819b..24d47f60e4 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/DriverBundleTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/DriverBundleTest.kt @@ -101,6 +101,33 @@ class DriverBundleTest { assertTrue(DriverBundle.all(context).isEmpty()) } + @Test fun aDisplayPickedAwayFromABundleTakesItsRuntimeHalfWithIt() { + val b = DriverBundle.install(context, bundle()) + DriverBundle.select(context, b) + DriverBundle.selectDisplay(context, TurnipDriver.AUTO) + assertEquals(TurnipDriver.AUTO, SessionPrefs.androidDriver(context)) + assertEquals("", SessionPrefs.linuxDriver(context)) + assertNull(DriverBundle.active(context)) + + DriverBundle.select(context, b) + DriverBundle.selectDisplay(context, "turnip25.1.0") + assertEquals("turnip25.1.0", SessionPrefs.androidDriver(context)) + assertEquals("", SessionPrefs.linuxDriver(context)) + } + + @Test fun aDisplayPickOutsideABundleKeepsTheChosenRuntime() { + SessionPrefs.setLinuxDriver(context, "my-linux-driver") + SessionPrefs.setAndroidDriver(context, "turnip25.1.0") + DriverBundle.selectDisplay(context, TurnipDriver.AUTO) + assertEquals(TurnipDriver.AUTO, SessionPrefs.androidDriver(context)) + assertEquals("my-linux-driver", SessionPrefs.linuxDriver(context)) + + val b = DriverBundle.install(context, bundle()) + DriverBundle.select(context, b) + DriverBundle.selectDisplay(context, b.androidId) + assertEquals(b.linuxId, SessionPrefs.linuxDriver(context)) + } + @Test fun aRefusedHalfLeavesNothingInstalled() { try { DriverBundle.install(context, bundle(linuxLibc = "libc.so"))