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

Commit 6e643052 authored Oct 13, 2022 by Chloris Kuo Committed by Automerger Merge Worker Oct 13, 2022

Disable Enhanced notifications setting when default NAS is not available am: 236eaed3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20188999

Change-Id: I68d337b4d5b947a7e0af817cb0c76039df18dbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 61cc95f7 236eaed3

src/com/android/settings/notification/NotificationAssistantPreferenceController.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,10 @@ public class NotificationAssistantPreferenceController extends TogglePreferenceC
		@Override
		public void updateState(Preference preference) {
		super.updateState(preference);
		if (isNASSettingActivityAvailable()) {
		if (mDefaultNASComponent == null) {
		preference.setEnabled(false);
		((PrimarySwitchPreference) preference).setSwitchEnabled(false);
		} else if (isNASSettingActivityAvailable()) {
		preference.setIntent(mNASSettingIntent);
		} else {
		// Cannot find settings activity from the default NAS app

tests/robotests/src/com/android/settings/notification/NotificationAssistantPreferenceControllerTest.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -226,4 +226,14 @@ public class NotificationAssistantPreferenceControllerTest {
		.setNASMigrationDoneAndResetDefault(eq(10), anyBoolean());
		}

		@Test
		public void testNASUnavailable_settingDisabled() throws Exception {
		when(mBackend.getDefaultNotificationAssistant()).thenReturn(null);
		mPreferenceController.getDefaultNASIntent();
		mPreferenceController.updateState(mPreference);

		verify(mPreference, times(1)).setSwitchEnabled(eq(false));
		assertFalse(mPreference.isEnabled());
		}

		}