diff --git a/src/com/android/settings/development/DesktopExperiencePreferenceController.java b/src/com/android/settings/development/DesktopExperiencePreferenceController.java index f6173a974e7..28e92fcdac5 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.isInternalDisplayEligibleToHostDesktops(mContext) + if (DesktopModeStatus.isDeviceEligibleForDesktopMode(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 6296626dedb..388e9b21f29 100644 --- a/tests/robotests/src/com/android/settings/development/DesktopExperiencePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DesktopExperiencePreferenceControllerTest.java @@ -102,7 +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)) + 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 02aa8725bd0..9f718f9db62 100644 --- a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java @@ -104,7 +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)) + 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 f3b96a4425f..2284d92cd70 100644 --- a/tests/robotests/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceControllerTest.java @@ -97,7 +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)) + when(mResources + .getBoolean(com.android.internal.R.bool.config_canInternalDisplayHostDesktops)) .thenReturn(false); } diff --git a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java index cf32ae83e00..b4b0bccf832 100644 --- a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java @@ -91,6 +91,7 @@ public class FreeformWindowsPreferenceControllerTest { doReturn(mFragmentManager).when(mActivity).getSupportFragmentManager(); doReturn(mActivity).when(mFragment).getActivity(); doReturn(true).when(mResources).getBoolean(R.bool.config_isDesktopModeSupported); + doReturn(true).when(mResources).getBoolean(R.bool.config_canInternalDisplayHostDesktops); mController = new FreeformWindowsPreferenceController(mContext, mFragment); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); when(mContext.getPackageManager()).thenReturn(mPackageManager);