PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update DesktopMode API name." into main

Browse Source
This commit is contained in:
Ben Lin
2025-02-08 10:48:00 -08:00
committed by Android (Google) Code Review
parent ba3dbd9d12 a20685eb3c
commit 1493a261d7
4 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/development/DesktopExperiencePreferenceController.java
View File

@@ -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);

2
tests/robotests/src/com/android/settings/development/DesktopExperiencePreferenceControllerTest.java
View File

@@ -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");
}

2
tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java
View File

@@ -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");
}

3
tests/robotests/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceControllerTest.java
View File

@@ -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();
}