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

Merge "Fix stray ProfileSelectDialog when only one profile exists" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-11-07 19:09:43 +00:00
committed by Android (Google) Code Review
parent 3d21de7e38 b152c2d34f
commit 0f687eafc5
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceController.java
View File

@@ -299,6 +299,7 @@ class ZenModePrioritySendersPreferenceController
List<UserHandle> userProfiles = mUserManager.getEnabledProfiles(); List<UserHandle> userProfiles = mUserManager.getEnabledProfiles();
if (userProfiles.size() <= 1) { if (userProfiles.size() <= 1) {
mContext.startActivity(intent); mContext.startActivity(intent);
return;
} }
mProfileSelectDialog = ProfileSelectDialog.createDialog(mContext, userProfiles, mProfileSelectDialog = ProfileSelectDialog.createDialog(mContext, userProfiles,

15
tests/robotests/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceControllerTest.java
View File

@@ -1545,6 +1545,21 @@ public final class ZenModePrioritySendersPreferenceControllerTest {
assertThat(nextActivity.getAction()).isEqualTo(Intent.ACTION_MAIN); assertThat(nextActivity.getAction()).isEqualTo(Intent.ACTION_MAIN);
} }
@Test
public void contactsSettingsClick_singleProfile_opensActivityWithoutDialog() {
String contactsPackage = mContext.getString(R.string.config_contacts_package_name);
setUpContactsApp(contactsPackage, /* withPreciseIntents= */ true);
mCallsController.displayPreference(mPreferenceScreen);
mCallsController.updateZenMode(mCallsPrefCategory, TestModeBuilder.EXAMPLE);
SelectorWithWidgetPreference contactsPref = getBoundSelectorPreference(KEY_CONTACTS);
contactsPref.getExtraWidget().performClick();
assertThat(ShadowDialog.getLatestDialog()).isNull();
assertThat(shadowOf(mActivity).getNextStartedActivity()).isNotNull();
}
@Test @Test
public void contactsSettingsClick_multipleProfiles_showsProfileChooserDialog() { public void contactsSettingsClick_multipleProfiles_showsProfileChooserDialog() {
String contactsPackage = mContext.getString(R.string.config_contacts_package_name); String contactsPackage = mContext.getString(R.string.config_contacts_package_name);