Revert "Update Android SDK Target to v32 (Android 12); request MANAGE…

…_EXTERNAL_STORAGE (icosa-foundation#563)"

This reverts commit 1433142.

Assets/Plugins/Android/AndroidManifest.xml

@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     android:installLocation="auto"
     xmlns:tools="http://schemas.android.com/tools">
-
     <application
         android:allowBackup="false"
         tools:replace="android:allowBackup"
@@ -16,9 +15,7 @@
                 <category android:name="com.oculus.intent.category.VR"/>
             </intent-filter>
         </activity>
-        <meta-data android:name="unityplayer.SkipPermissionsDialog" android:value="true" />
+        <meta-data android:name="unityplayer.SkipPermissionsDialog" android:value="false" />
     </application>
     <uses-permission android:name="android.permission.RECORD_AUDIO" tools:node="remove"/>
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="com.oculus.permission.USE_SCENE" />
 </manifest>

Assets/Scenes/Loading.unity

@@ -206,27 +206,6 @@ MonoBehaviour:
   m_VrCamera: {fileID: 1815664868}
   m_MaximumLoadingTime: 60
   m_SceneLoadRatio: 0.75
-  m_LoadingText:
-    m_TableReference:
-      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
-    m_TableEntryReference:
-      m_KeyId: 287897575133184
-      m_Key: 
-    m_FallbackState: 0
-    m_WaitForCompletion: 0
-    m_LocalVariables: []
-  m_RequestAndroidFolderPermissions:
-    m_TableReference:
-      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
-    m_TableEntryReference:
-      m_KeyId: 170004956477833216
-      m_Key: 
-    m_FallbackState: 0
-    m_WaitForCompletion: 0
-    m_LocalVariables: []
-  references:
-    version: 2
-    RefIds: []
 --- !u!4 &326031496
 Transform:
   m_ObjectHideFlags: 0

Assets/Scripts/LoadingScene.cs

@@ -15,11 +15,6 @@
 using System.Collections;
 using UnityEngine;
 using UnityEngine.SceneManagement;
-using UnityEngine.Localization;
-
-#if UNITY_ANDROID
-using UnityEngine.Android;
-#endif
 
 namespace TiltBrush
 {
@@ -32,17 +27,11 @@ public class LoadingScene : MonoBehaviour
         // Amount of the progress bar taken up by the scene load
         [SerializeField] private float m_SceneLoadRatio;
 
-        [SerializeField] private LocalizedString m_LoadingText;
-        [SerializeField] private LocalizedString m_RequestAndroidFolderPermissions;
-
         // We have a slightly faked loading position that will always increase
         // The fake loading rate is the minimum amount it will increase in one second, the reciprocal of
         // m_MaximumLoadingTime
         private float m_FakeLoadingRate;
         private float m_CurrentLoadingPosition;
-#if UNITY_ANDROID
-        private bool m_FolderPermissionOverride = false;
-#endif
 
         private IEnumerator Start()
         {
@@ -69,23 +58,6 @@ private IEnumerator Start()
 
             DontDestroyOnLoad(gameObject);
 
-#if UNITY_ANDROID
-            if (Application.platform == RuntimePlatform.Android)
-            {
-                if (!UserHasManageExternalStoragePermission())
-                {
-                    m_Overlay.MessageStatus = m_RequestAndroidFolderPermissions.GetLocalizedString();
-                    AskForManageStoragePermission();
-                    while (!UserHasManageExternalStoragePermission())
-                    {
-                        yield return new WaitForEndOfFrame();
-                    }
-
-                    m_Overlay.MessageStatus = m_LoadingText.GetLocalizedString();
-                }
-            }
-#endif
-
             AsyncOperation asyncLoad = SceneManager.LoadSceneAsync("Main");
             while (!asyncLoad.isDone)
             {
@@ -119,45 +91,5 @@ private void UpdateProgress(float start, float scale, float progress)
             m_CurrentLoadingPosition = Mathf.Max(m_CurrentLoadingPosition, position);
             m_Overlay.Progress = m_CurrentLoadingPosition;
         }
-
-#if UNITY_ANDROID
-        private bool UserHasManageExternalStoragePermission()
-        {
-            bool isExternalStorageManager = false;
-            try
-            {
-                AndroidJavaClass environmentClass = new AndroidJavaClass("android.os.Environment");
-                isExternalStorageManager = environmentClass.CallStatic<bool>("isExternalStorageManager");
-            }
-            catch (AndroidJavaException e)
-            {
-                Debug.LogError("Java Exception caught and ignored: " + e.Message);
-                Debug.LogError("Assuming this means this device doesn't support isExternalStorageManager.");
-            }
-            return m_FolderPermissionOverride || isExternalStorageManager;
-        }
-
-        private void AskForManageStoragePermission()
-        {
-            try
-            {
-                using var unityClass = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
-                using AndroidJavaObject currentActivityObject = unityClass.GetStatic<AndroidJavaObject>("currentActivity");
-                string packageName = currentActivityObject.Call<string>("getPackageName");
-                using var uriClass = new AndroidJavaClass("android.net.Uri");
-                using AndroidJavaObject uriObject = uriClass.CallStatic<AndroidJavaObject>("fromParts", "package", packageName, null);
-                using var intentObject = new AndroidJavaObject("android.content.Intent", "android.settings.MANAGE_APP_ALL_FILES_ACCESS_PERMISSION", uriObject);
-                intentObject.Call<AndroidJavaObject>("addCategory", "android.intent.category.DEFAULT");
-                currentActivityObject.Call("startActivity", intentObject);
-            }
-            catch (AndroidJavaException e)
-            {
-                // TODO: only skip this if it's of type act=android.settings.MANAGE_APP_ALL_FILES_ACCESS_PERMISSION
-                m_FolderPermissionOverride = true;
-                Debug.LogError("Java Exception caught and ignored: " + e.Message);
-                Debug.LogError("Assuming this means we don't need android.settings.MANAGE_APP_ALL_FILES_ACCESS_PERMISSION (e.g., Android SDK < 30)");
-            }
-        }
-#endif
     }
 } // namespace TiltBrush

Assets/Settings/Localization/Strings/Strings Shared Data.asset

@@ -540,7 +540,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 287897575133184
-    m_Key: LOADING_SCENE_OVERLAY_LOADING
+    m_Key: LOADING_SCENE_OVERLAY_MESSAGE
     m_Metadata:
       m_Items: []
   - m_Id: 7892854560759808
@@ -3271,14 +3271,6 @@ MonoBehaviour:
     m_Key: POPUP_RECORD_UNSUPPORTED_TEXT
     m_Metadata:
       m_Items: []
-  - m_Id: 170004956477833216
-    m_Key: LOADING_SCENE_OVERLAY_ANDROIDPERMISSIONS
-    m_Metadata:
-      m_Items: []
-  - m_Id: 172767995928834048
-    m_Key: CONTROLLER_HINT_THUMBPAD_BRUSHSIZE
-    m_Metadata:
-      m_Items: []
   m_Metadata:
     m_Items: []
   m_KeyGenerator:

Assets/Settings/Localization/Strings/Strings_en.asset

@@ -3101,7 +3101,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 106429517453328384
-    m_Localized: Background Images
+    m_Localized: "Background Images"
     m_Metadata:
       m_Items: []
   - m_Id: 95221400803737600
@@ -3457,21 +3457,11 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 151490030713540608
-    m_Localized: 'You can create a video of your sketch by opening it on a Mac or
-      PC. Search for "Exporting video" on our docs website: https://docs.openbrush.app
+    m_Localized: 'You can create a video of your sketch by opening it on a Mac or PC.
+      Search for "Exporting video" on our docs website: https://docs.openbrush.app
       for a step by step guide.'
     m_Metadata:
       m_Items: []
-  - m_Id: 170004956477833216
-    m_Localized: Please give Open Brush file access to save your creations!
-    m_Metadata:
-      m_Items: []
-  - m_Id: 172767995928834048
-    m_Localized: 'Swipe To Adjust
-
-      Brush Size'
-    m_Metadata:
-      m_Items: []
   references:
     version: 2
     RefIds: []

Assets/XR/Settings/OpenXR Editor Settings.asset

@@ -17,5 +17,4 @@ MonoBehaviour:
   - featureSets: []
   - featureSets:
     - com.qualcomm.snapdragon.spaces
-    - com.qualcomm.snapdragon.spaces.experimental
   m_vulkanAdditionalGraphicsQueue: 0

ProjectSettings/ProjectSettings.asset

@@ -187,7 +187,7 @@ PlayerSettings:
   overrideDefaultApplicationIdentifier: 1
   AndroidBundleVersionCode: 1
   AndroidMinSdkVersion: 29
-  AndroidTargetSdkVersion: 32
+  AndroidTargetSdkVersion: 31
   AndroidPreferredInstallLocation: 0
   aotOptions: 
   stripEngineCode: 1