godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable configuration of the `android:excludeFromRecents` activity attribute. 

(cherry picked from commit cfa81ff32a)
This commit is contained in:
Fredia Huya-Kouadio 2021-12-09 08:49:32 -08:00 committed by Rémi Verschelde
parent 599ae423ba
commit 4f6ce8a7ba
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/android/export/export_plugin.cpp
View File

@ -846,6 +846,7 @@ void EditorExportPlatformAndroid::_fix_manifest(const Ref<EditorExportPreset> &p
bool backup_allowed = p_preset->get("user_data_backup/allow"); bool backup_allowed = p_preset->get("user_data_backup/allow");
bool classify_as_game = p_preset->get("package/classify_as_game"); bool classify_as_game = p_preset->get("package/classify_as_game");
bool retain_data_on_uninstall = p_preset->get("package/retain_data_on_uninstall"); bool retain_data_on_uninstall = p_preset->get("package/retain_data_on_uninstall");
bool exclude_from_recents = p_preset->get("package/exclude_from_recents");
Vector<String> perms; Vector<String> perms;
// Write permissions into the perms variable. // Write permissions into the perms variable.
@ -959,6 +960,10 @@ void EditorExportPlatformAndroid::_fix_manifest(const Ref<EditorExportPreset> &p
encode_uint32(screen_orientation, &p_manifest.write[iofs + 16]); encode_uint32(screen_orientation, &p_manifest.write[iofs + 16]);
} }
if (tname == "activity" && attrname == "excludeFromRecents") {
encode_uint32(exclude_from_recents, &p_manifest.write[iofs + 16]);
}
if (tname == "supports-screens") { if (tname == "supports-screens") {
if (attrname == "smallScreens") { if (attrname == "smallScreens") {
encode_uint32(screen_support_small ? 0xFFFFFFFF : 0, &p_manifest.write[iofs + 16]); encode_uint32(screen_support_small ? 0xFFFFFFFF : 0, &p_manifest.write[iofs + 16]);
@ -1703,6 +1708,7 @@ void EditorExportPlatformAndroid::get_export_options(List<ExportOption> *r_optio
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "package/signed"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "package/signed"), true));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "package/classify_as_game"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "package/classify_as_game"), true));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "package/retain_data_on_uninstall"), false)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "package/retain_data_on_uninstall"), false));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "package/exclude_from_recents"), false));
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, launcher_icon_option, PROPERTY_HINT_FILE, "*.png"), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, launcher_icon_option, PROPERTY_HINT_FILE, "*.png"), ""));
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, launcher_adaptive_icon_foreground_option, PROPERTY_HINT_FILE, "*.png"), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, launcher_adaptive_icon_foreground_option, PROPERTY_HINT_FILE, "*.png"), ""));

4
platform/android/export/gradle_export_util.cpp
View File

@ -253,8 +253,10 @@ String _get_activity_tag(const Ref<EditorExportPreset> &p_preset) {
OS::get_singleton()->get_screen_orientation_from_string(GLOBAL_GET("display/window/handheld/orientation"))); OS::get_singleton()->get_screen_orientation_from_string(GLOBAL_GET("display/window/handheld/orientation")));
String manifest_activity_text = vformat( String manifest_activity_text = vformat(
" <activity android:name=\"com.godot.game.GodotApp\" " " <activity android:name=\"com.godot.game.GodotApp\" "
"tools:replace=\"android:screenOrientation\" " "tools:replace=\"android:screenOrientation,android:excludeFromRecents\" "
"android:excludeFromRecents=\"%s\" "
"android:screenOrientation=\"%s\">\n", "android:screenOrientation=\"%s\">\n",
bool_to_string(p_preset->get("package/exclude_from_recents")),
orientation); orientation);
if (uses_xr) { if (uses_xr) {
manifest_activity_text += " <meta-data tools:node=\"replace\" android:name=\"com.oculus.vr.focusaware\" android:value=\"true\" />\n"; manifest_activity_text += " <meta-data tools:node=\"replace\" android:name=\"com.oculus.vr.focusaware\" android:value=\"true\" />\n";

1
platform/android/java/app/AndroidManifest.xml
View File

@ -48,6 +48,7 @@
android:label="@string/godot_project_name_string" android:label="@string/godot_project_name_string"
android:theme="@style/GodotAppSplashTheme" android:theme="@style/GodotAppSplashTheme"
android:launchMode="singleTask" android:launchMode="singleTask"
android:excludeFromRecents="false"
android:screenOrientation="landscape" android:screenOrientation="landscape"
android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode" android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
android:resizeableActivity="false" android:resizeableActivity="false"