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

Show options greyed out inactive display

Browse Source 
Test: ExternalDisplayPreferenceFragmentTest
Flag: com.android.settings.flags.display_topology_pane_in_display_list
Bug: b/398846256
Change-Id: I6020212843c10867447809910a0202b7dbacd909
This commit is contained in:
Matthew DeVore
2025-02-26 03:37:54 +00:00
parent 29132988b2
commit 02fff0174f
2 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragmentTest.java
View File

@@ -25,6 +25,7 @@ import static com.android.settings.flags.Flags.FLAG_DISPLAY_SIZE_CONNECTED_DISPL
import static com.android.settings.flags.Flags.FLAG_DISPLAY_TOPOLOGY_PANE_IN_DISPLAY_LIST;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -161,6 +162,34 @@ public class ExternalDisplayPreferenceFragmentTest extends ExternalDisplayTestBa
assertThat(listPref).isNull();
}
@Test
@UiThreadTest
public void testShowDisplayControlsDisabled() {
doReturn(new Display[] {mDisplays[0], mDisplays[2]}).when(mMockedInjector)
.getEnabledDisplays();
doReturn(true).when(mMockedInjector).isDisplayEnabled(mDisplays[0]);
doReturn(false).when(mMockedInjector).isDisplayEnabled(mDisplays[1]);
doReturn(true).when(mMockedInjector).isDisplayEnabled(mDisplays[2]);
initFragment();
mHandler.flush();
assertDisplayListCount(2);
Preference pref;
for (int disp = 0; disp < 2; disp++) {
pref = mPreferenceScreen.findPreference(
PrefBasics.EXTERNAL_DISPLAY_RESOLUTION.keyForNth(disp));
assertWithMessage("resolution " + disp).that(pref.isEnabled()).isEqualTo(disp == 1);
pref = mPreferenceScreen.findPreference(
PrefBasics.EXTERNAL_DISPLAY_ROTATION.keyForNth(disp));
assertWithMessage("rotation " + disp).that(pref.isEnabled()).isEqualTo(disp == 1);
pref = mPreferenceScreen.findPreference(
PrefBasics.EXTERNAL_DISPLAY_SIZE.keyForNth(disp));
assertWithMessage("size " + disp).that(pref.isEnabled()).isEqualTo(disp == 1);
}
}
@Test
@UiThreadTest
public void testLaunchDisplaySettingFromList() {
@@ -280,13 +309,13 @@ public class ExternalDisplayPreferenceFragmentTest extends ExternalDisplayTestBa
assertThat(mainPref.isEnabled()).isTrue();
assertThat(mainPref.getOnPreferenceChangeListener()).isNotNull();
var pref = category.findPreference(PrefBasics.EXTERNAL_DISPLAY_RESOLUTION.keyForNth(0));
assertThat(pref).isNull();
assertThat(pref.isEnabled()).isFalse();
pref = category.findPreference(PrefBasics.EXTERNAL_DISPLAY_ROTATION.keyForNth(0));
assertThat(pref).isNull();
assertThat(pref.isEnabled()).isFalse();
var footerPref = category.findPreference(PrefBasics.FOOTER.key);
assertThat(footerPref).isNull();
var sizePref = category.findPreference(PrefBasics.EXTERNAL_DISPLAY_SIZE.keyForNth(0));
assertThat(sizePref).isNull();
assertThat(sizePref.isEnabled()).isFalse();
}
@Test