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

Commit ea1cad37 authored by Pragya Bajoria's avatar Pragya Bajoria Committed by Android (Google) Code Review
Browse files

Merge "Rename DesktopMode API back" into main

parents a219b4da 32f7568c

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.isInternalDisplayEligibleToHostDesktops(mContext)

        if (DesktopModeStatus.isDeviceEligibleForDesktopMode(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 −1
Original line number Diff line number Diff line
@@ -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");

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

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

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

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

    }

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

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