Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bf2dbde authored by Jiaming Liu's avatar Jiaming Liu Committed by Android (Google) Code Review
Browse files

Merge "[AE] Switch to new flag under desktop exp" into main

parents e14ebda9 df04a283

src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings.activityembedding;



import static android.window.DesktopExperienceFlags.ENABLE_ACTIVITY_EMBEDDING_SUPPORT_FOR_CONNECTED_DISPLAYS;



import android.app.Activity;

import android.content.Context;

import android.os.SystemProperties;
@@ -28,7 +30,6 @@ 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;
@@ -50,7 +51,7 @@ public class ActivityEmbeddingUtils { 
     */

    private static final boolean SHOULD_ENABLE_LARGE_SCREEN_OPTIMIZATION =

            SystemProperties.getBoolean("persist.settings.large_screen_opt.enabled", false)

                    || (Flags.activityEmbeddingSupportForConnectedDisplays()

                    || (ENABLE_ACTIVITY_EMBEDDING_SUPPORT_FOR_CONNECTED_DISPLAYS.isTrue()

                    && SystemProperties.getBoolean(

                            "persist.settings.large_screen_opt_for_dp.enabled", false));