From 4fe27bd07034d2f01a535cb84516b41f054e050a Mon Sep 17 00:00:00 2001 From: Jiaming Liu Date: Wed, 18 Dec 2024 04:22:55 +0000 Subject: [PATCH] [AE] Enable AE Split for phones supporting display port Bug: 372200182 Test: Manual Flag: com.android.window.flags.activity_embedding_support_for_connected_displays Change-Id: I16093f8bb6f2fb00b57169d315553b496052c39c --- .../settings/activityembedding/ActivityEmbeddingUtils.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java b/src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java index b91e0e5eacd..594cf60c414 100644 --- a/src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java +++ b/src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java @@ -28,6 +28,7 @@ import androidx.window.embedding.ActivityEmbeddingController; import androidx.window.embedding.SplitController; import com.android.settings.R; +import com.android.window.flags.Flags; import com.google.android.setupcompat.util.WizardManagerHelper; @@ -48,7 +49,10 @@ public class ActivityEmbeddingUtils { * @see androidx.window.embedding.SplitController.SplitSupportStatus#SPLIT_UNAVAILABLE */ private static final boolean SHOULD_ENABLE_LARGE_SCREEN_OPTIMIZATION = - SystemProperties.getBoolean("persist.settings.large_screen_opt.enabled", false); + SystemProperties.getBoolean("persist.settings.large_screen_opt.enabled", false) + || (Flags.activityEmbeddingSupportForConnectedDisplays() + && SystemProperties.getBoolean( + "persist.settings.large_screen_opt_for_dp.enabled", false)); private static final String TAG = "ActivityEmbeddingUtils";