diff --git a/src/com/android/settings/development/DesktopExperiencePreferenceController.java b/src/com/android/settings/development/DesktopExperiencePreferenceController.java index 28e92fcdac5..f6173a974e7 100644 --- a/src/com/android/settings/development/DesktopExperiencePreferenceController.java +++ b/src/com/android/settings/development/DesktopExperiencePreferenceController.java @@ -98,7 +98,7 @@ public class DesktopExperiencePreferenceController extends DeveloperOptionsPrefe @Override public CharSequence getSummary() { - if (DesktopModeStatus.isDeviceEligibleForDesktopMode(mContext) + if (DesktopModeStatus.isInternalDisplayEligibleToHostDesktops(mContext) && !DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODE.isTrue()) { return mContext.getString( R.string.enable_desktop_experience_features_summary_with_desktop); diff --git a/tests/robotests/src/com/android/settings/development/DesktopExperiencePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DesktopExperiencePreferenceControllerTest.java index 26a802629d7..6296626dedb 100644 --- a/tests/robotests/src/com/android/settings/development/DesktopExperiencePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DesktopExperiencePreferenceControllerTest.java @@ -102,6 +102,8 @@ public class DesktopExperiencePreferenceControllerTest { // Set desktop mode available when(mResources.getBoolean(com.android.internal.R.bool.config_isDesktopModeSupported)) .thenReturn(true); + when(mResources.getBoolean(com.android.internal.R.bool.config_canInternalDisplayHostDesktops)) + .thenReturn(true); ShadowSystemProperties.override("persist.wm.debug.desktop_mode_enforce_device_restrictions", "false"); } diff --git a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java index 3330d06c209..02aa8725bd0 100644 --- a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java @@ -104,6 +104,8 @@ public class DesktopModePreferenceControllerTest { // Set desktop mode available when(mResources.getBoolean(R.bool.config_isDesktopModeSupported)) .thenReturn(true); + when(mResources.getBoolean(com.android.internal.R.bool.config_canInternalDisplayHostDesktops)) + .thenReturn(true); ShadowSystemProperties.override("persist.wm.debug.desktop_mode_enforce_device_restrictions", "false"); } diff --git a/tests/robotests/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceControllerTest.java index dc6ac3fafba..f3b96a4425f 100644 --- a/tests/robotests/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceControllerTest.java @@ -97,6 +97,8 @@ public class DesktopModeSecondaryDisplayPreferenceControllerTest { when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); mController.displayPreference(mScreen); when(mResources.getBoolean(R.bool.config_isDesktopModeSupported)).thenReturn(false); + when(mResources.getBoolean(com.android.internal.R.bool.config_canInternalDisplayHostDesktops)) + .thenReturn(false); } @DisableFlags(Flags.FLAG_SHOW_DESKTOP_EXPERIENCE_DEV_OPTION) @@ -109,6 +111,7 @@ public class DesktopModeSecondaryDisplayPreferenceControllerTest { @Test public void isAvailable_whenDesktopExperienceDevOptionIsEnabled_shouldBeFalse() { when(mResources.getBoolean(R.bool.config_isDesktopModeSupported)).thenReturn(true); + when(mResources.getBoolean(R.bool.config_canInternalDisplayHostDesktops)).thenReturn(true); assertThat(mController.isAvailable()).isFalse(); }