mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-30 06:32:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Adjust user data text to match DocumentProvider

Browse Source
This commit is contained in:
Robin Kertels 2023-03-24 00:53:40 +01:00
parent 43d346aba4
commit ee563189fd
No known key found for this signature in database
GPG Key ID: 3824904F14D40757
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/UserDataActivity.kt
View File

@ -51,6 +51,7 @@ class UserDataActivity : AppCompatActivity() {
WindowCompat.setDecorFitsSystemWindows(window, false)
val android7 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
val android10 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
val android11 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
val legacy = DirectoryInitialization.isUsingLegacyUserDirectory()
@ -59,6 +60,10 @@ class UserDataActivity : AppCompatActivity() {
if (android10) R.string.user_data_new_location_android_10 else R.string.user_data_new_location
mBinding.textType.setText(if (legacy) R.string.user_data_old_location else userDataNewLocation)
val openFileManagerStringId =
if (android7) R.string.user_data_open_user_folder else R.string.user_data_open_system_file_manager
mBinding.buttonOpenSystemFileManager.setText(openFileManagerStringId)
mBinding.textPath.text = DirectoryInitialization.getUserDirectory()
mBinding.textAndroid11.visibility = if (android11 && !legacy) View.VISIBLE else View.GONE

4
Source/Android/app/src/main/res/values/strings.xml
View File

@ -401,8 +401,10 @@
<string name="user_data_new_location">Your user data (settings, saves, etc.) is stored in a location which <b>will be deleted</b> when you uninstall the app:</string>
<!-- Android 10 and up support android:hasFragileUserData -->
<string name="user_data_new_location_android_10">Your user data (settings, saves, etc.) is stored in a location which by default <b>will be deleted</b> when you uninstall the app:</string>
<string name="user_data_new_location_android_11">Because you\'re using Android 11 or newer, file manager apps can\'t access this folder in the same way as regular folders. You might be able to access the folder using the system file manager (if present on your device), or by connecting your device to a PC.</string>
<string name="user_data_new_location_android_11">Because you\'re using Android 11 or newer, file manager apps can\'t access this folder in the same way as regular folders. Instead, Dolphin acts as a file provider.</string>
<string name="user_data_open_system_file_manager">Open System File Manager</string>
<string name="user_data_open_user_folder">Open User Data Folder</string>
<string name="user_data_import">Import User Data</string>
<string name="user_data_export">Export User Data</string>
<string name="user_data_open_system_file_manager_failed">Sorry, Dolphin couldn\'t find the system file manager on your device.</string>