Add a memory stick start screen for Tools/android_run.py

--start-screen=memstick opens the memory stick screen as the settings do, for
moving an existing memory stick, where memsticksetup is the first-boot one.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Core/CmdLine.cpp

@@ -216,7 +216,7 @@ const char *g_ExceptionActionValues[] = {
 static const CommandLineParam g_autoParams[] = {
 	{POFF(fullscreen), CmdParamType::Bool, "fullscreen", '\0', "Force full screen mode", CmdLineMode::Application},
 	{POFF(fullscreen), CmdParamType::BoolInverse, "windowed", '\0', "Force windowed mode", CmdLineMode::Application},
-	{POFF(startScreen), CmdParamType::String, "start-screen", '\0', "Start on a specific screen (e.g. 'gamesettings', 'touchscreentest', 'firmware', 'storagetest')", CmdLineMode::Application},
+	{POFF(startScreen), CmdParamType::String, "start-screen", '\0', "Start on a specific screen (e.g. 'gamesettings', 'touchscreentest', 'firmware', 'memstick', 'storagetest')", CmdLineMode::Application},
 	{POFF(escapeExit), CmdParamType::Bool, "escape-exit", '\0', "Escape key exits the application", CmdLineMode::Application},
 	{POFF(gameWindow), CmdParamType::Bool, "game-window", '\0', "Show the game in a second window, for testing multiple outputs (Vulkan, or Metal on Mac)", CmdLineMode::Application},
 	{POFF(pauseMenuExit), CmdParamType::Bool, "pause-menu-exit", '\0', "Exit the application when the game ends, instead of returning to the menu", CmdLineMode::Application},

Tools/android_run.py

@@ -18,7 +18,7 @@
 
 """Starts PPSSPP on an Android device, with command line options, optionally building and installing it first.
 
-    python Tools/android_run.py --build --start-screen=memsticksetup   # build, install, open the memory stick setup
+    python Tools/android_run.py --build --start-screen=memstick   # build, install, open the memory stick screen
     python Tools/android_run.py --log --start-screen=firmware     # follow the app's log until Ctrl+C
     python Tools/android_run.py -- --some-option=x                # anything after -- goes to the app as is
 
@@ -76,7 +76,7 @@ def main():
 	parser.add_argument("--build", action="store_true", help="build and install the normal debug APK first")
 	parser.add_argument("-s", "--device", help="adb device serial, if there's more than one")
 	parser.add_argument("--log", action="store_true", help="follow the app's log (the PPSSPP tag) until Ctrl+C")
-	parser.add_argument("--start-screen", help="the screen to start on, like memsticksetup, firmware or storagetest")
+	parser.add_argument("--start-screen", help="the screen to start on, like memstick, memsticksetup, firmware or storagetest")
 	parser.add_argument("app_args", nargs="*", help="more options for the app, after --")
 	args = parser.parse_args()
 

UI/NativeApp.cpp

@@ -911,6 +911,10 @@ void NativeInit(int argc, const char *argv[], const CommandLineOptions &cmdLineO
 		} else if (equals(cmdLineOptions.startScreen.value(), "memsticksetup")) {
 			g_screenManager->switchScreen(new MainScreen());
 			g_screenManager->push(new MemStickScreen(true));
+		} else if (equals(cmdLineOptions.startScreen.value(), "memstick")) {
+			// As opened from the settings, to move an existing memory stick.
+			g_screenManager->switchScreen(new MainScreen());
+			g_screenManager->push(new MemStickScreen(false));
 		} else if (equals(cmdLineOptions.startScreen.value(), "storagetest")) {
 			g_screenManager->switchScreen(new MainScreen());
 			g_screenManager->push(new StorageTestScreen());

docs/android-device-testing.md

@@ -84,11 +84,12 @@ away within seconds, which reads as "logging stopped" rather than "logging was l
 
 ## Starting the app with options
 
-    python Tools/android_run.py --build --start-screen=memsticksetup   # build, install, open the memory stick setup
-    python Tools/android_run.py --log --start-screen=firmware          # and follow the app's log
+    python Tools/android_run.py --build --start-screen=memstick   # build, install, open the memory stick screen
+    python Tools/android_run.py --log --start-screen=firmware     # and follow the app's log
 
 It force-stops the app first, since options are only read at startup, and passes them in the
-`org.ppsspp.ppsspp.Args` intent extra. It also sets `log.tag.PPSSPP` to `V`: some devices default every
+`org.ppsspp.ppsspp.Args` intent extra. (`memstick` is the memory stick screen as opened from the
+settings, `memsticksetup` the first-boot one.) It also sets `log.tag.PPSSPP` to `V`: some devices default every
 tag to silent (`persist.log.tag` is `S`), and then logcat busily shows other apps but never a line of ours. The `--start-screen` names are in `NativeInit()` in `UI/NativeApp.cpp`.
 
 ## Running the C++ unit tests on a device