Merge pull request #84415 from m4gr3d/fix_editor_crash_after_backing_from_game_3x

[3.x] Fix Android editor crash issue
This commit is contained in:
Rémi Verschelde 2023-11-14 11:37:39 +01:00
commit 6618a2e745
No known key found for this signature in database
GPG key ID: C3336907360768E1

View file

@ -35,7 +35,7 @@
<activity <activity
android:name=".GodotProjectManager" android:name=".GodotProjectManager"
android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode" android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
android:launchMode="singleInstance" android:launchMode="singleTask"
android:screenOrientation="userLandscape" android:screenOrientation="userLandscape"
android:exported="true" android:exported="true"
android:process=":GodotProjectManager"> android:process=":GodotProjectManager">
@ -53,7 +53,7 @@
android:name=".GodotEditor" android:name=".GodotEditor"
android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode" android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
android:process=":GodotEditor" android:process=":GodotEditor"
android:launchMode="singleInstance" android:launchMode="singleTask"
android:screenOrientation="userLandscape" android:screenOrientation="userLandscape"
android:exported="false"> android:exported="false">
<layout android:defaultHeight="@dimen/editor_default_window_height" <layout android:defaultHeight="@dimen/editor_default_window_height"
@ -65,7 +65,7 @@
android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode" android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
android:label="@string/godot_project_name_string" android:label="@string/godot_project_name_string"
android:process=":GodotGame" android:process=":GodotGame"
android:launchMode="singleInstance" android:launchMode="singleTask"
android:exported="false" android:exported="false"
android:screenOrientation="userLandscape"> android:screenOrientation="userLandscape">
<layout android:defaultHeight="@dimen/editor_default_window_height" <layout android:defaultHeight="@dimen/editor_default_window_height"