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

Rename DesktopMode API back

Browse Source 
Also fix some indentation.

Bug: 395826065
Test: atest, Manual
Flag: EXEMPT bugfix
Change-Id: I50d30a8508d387e36981fb3bdd13b99480baedcf
This commit is contained in:
Ben Lin
2025-02-12 04:15:46 +00:00
parent a7caa23deb
commit 32f7568cd4
5 changed files with 8 additions and 4 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 @Override
public CharSequence getSummary() { public CharSequence getSummary() {
if (DesktopModeStatus.isInternalDisplayEligibleToHostDesktops(mContext) if (DesktopModeStatus.isDeviceEligibleForDesktopMode(mContext)
&& !DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODE.isTrue()) { && !DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODE.isTrue()) {
return mContext.getString( return mContext.getString(
R.string.enable_desktop_experience_features_summary_with_desktop); R.string.enable_desktop_experience_features_summary_with_desktop);

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

@@ -102,7 +102,8 @@ public class DesktopExperiencePreferenceControllerTest {
// Set desktop mode available // Set desktop mode available
when(mResources.getBoolean(com.android.internal.R.bool.config_isDesktopModeSupported)) when(mResources.getBoolean(com.android.internal.R.bool.config_isDesktopModeSupported))
.thenReturn(true); .thenReturn(true);
when(mResources.getBoolean(com.android.internal.R.bool.config_canInternalDisplayHostDesktops)) when(mResources
.getBoolean(com.android.internal.R.bool.config_canInternalDisplayHostDesktops))
.thenReturn(true); .thenReturn(true);
ShadowSystemProperties.override("persist.wm.debug.desktop_mode_enforce_device_restrictions", ShadowSystemProperties.override("persist.wm.debug.desktop_mode_enforce_device_restrictions",
"false"); "false");

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

@@ -104,7 +104,8 @@ public class DesktopModePreferenceControllerTest {
// Set desktop mode available // Set desktop mode available
when(mResources.getBoolean(R.bool.config_isDesktopModeSupported)) when(mResources.getBoolean(R.bool.config_isDesktopModeSupported))
.thenReturn(true); .thenReturn(true);
when(mResources.getBoolean(com.android.internal.R.bool.config_canInternalDisplayHostDesktops)) when(mResources
.getBoolean(com.android.internal.R.bool.config_canInternalDisplayHostDesktops))
.thenReturn(true); .thenReturn(true);
ShadowSystemProperties.override("persist.wm.debug.desktop_mode_enforce_device_restrictions", ShadowSystemProperties.override("persist.wm.debug.desktop_mode_enforce_device_restrictions",
"false"); "false");

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

@@ -97,7 +97,8 @@ public class DesktopModeSecondaryDisplayPreferenceControllerTest {
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
when(mResources.getBoolean(R.bool.config_isDesktopModeSupported)).thenReturn(false); 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); .thenReturn(false);
} }

1
tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
View File

@@ -91,6 +91,7 @@ public class FreeformWindowsPreferenceControllerTest {
doReturn(mFragmentManager).when(mActivity).getSupportFragmentManager(); doReturn(mFragmentManager).when(mActivity).getSupportFragmentManager();
doReturn(mActivity).when(mFragment).getActivity(); doReturn(mActivity).when(mFragment).getActivity();
doReturn(true).when(mResources).getBoolean(R.bool.config_isDesktopModeSupported); doReturn(true).when(mResources).getBoolean(R.bool.config_isDesktopModeSupported);
doReturn(true).when(mResources).getBoolean(R.bool.config_canInternalDisplayHostDesktops);
mController = new FreeformWindowsPreferenceController(mContext, mFragment); mController = new FreeformWindowsPreferenceController(mContext, mFragment);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
when(mContext.getPackageManager()).thenReturn(mPackageManager); when(mContext.getPackageManager()).thenReturn(mPackageManager);