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

Commit 1493a261 authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "Update DesktopMode API name." into main

parents ba3dbd9d a20685eb

src/com/android/settings/development/DesktopExperiencePreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

tests/robotests/src/com/android/settings/development/DesktopExperiencePreferenceControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -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");

    }

tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -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");

    }

tests/robotests/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceControllerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -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();

    }