From 19ebbb6a30707da9b0e4d17f3eb03b6aa160b3db Mon Sep 17 00:00:00 2001 From: Lubos Date: Tue, 26 Jul 2022 17:32:03 +0200 Subject: [PATCH] OpenXR - Integrate SYSPROP_HAS_FILE_BROWSER --- UI/MainScreen.cpp | 2 -- android/jni/app-android.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 0a1b2454eb..cb5fbf0116 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -1131,11 +1131,9 @@ void MainScreen::CreateViews() { ver->SetSmall(true); ver->SetClip(false); -#ifndef OPENXR if (System_GetPropertyBool(SYSPROP_HAS_FILE_BROWSER)) { rightColumnItems->Add(new Choice(mm->T("Load", "Load...")))->OnClick.Handle(this, &MainScreen::OnLoadFile); } -#endif rightColumnItems->Add(new Choice(mm->T("Game Settings", "Settings")))->OnClick.Handle(this, &MainScreen::OnGameSettings); rightColumnItems->Add(new Choice(mm->T("Credits")))->OnClick.Handle(this, &MainScreen::OnCredits); rightColumnItems->Add(new Choice(mm->T("www.ppsspp.org")))->OnClick.Handle(this, &MainScreen::OnPPSSPPOrg); diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index aaa9e1298e..eb83ef7b09 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -503,7 +503,7 @@ bool System_GetPropertyBool(SystemProperty prop) { case SYSPROP_HAS_FILE_BROWSER: // It's only really needed with scoped storage, but why not make it available // as far back as possible - works just fine. - return androidVersion >= 19; // when ACTION_OPEN_DOCUMENT was added + return (androidVersion >= 19) && (deviceType != DEVICE_TYPE_VR); // when ACTION_OPEN_DOCUMENT was added case SYSPROP_HAS_FOLDER_BROWSER: // Uses OPEN_DOCUMENT_TREE to let you select a folder. // Doesn't actually mean it's usable though, in many early versions of Android