Merge "Hide ZenMode.getRule() - Settings" into main (a8b18f95) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/notification/modes/ConfigurationActivityHelper.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -48,21 +48,22 @@ class ConfigurationActivityHelper {
		Intent getConfigurationActivityIntentForMode(ZenMode zenMode,
		Function<ComponentName, ComponentInfo> approvedServiceFinder) {

		String owner = zenMode.getRule().getPackageName();
		ZenMode.Owner owner = zenMode.getOwner();
		ComponentName configActivity = null;
		if (zenMode.getRule().getConfigurationActivity() != null) {
		if (owner.configurationActivity() != null) {
		// If a configuration activity is present, use that directly in the intent
		configActivity = zenMode.getRule().getConfigurationActivity();
		configActivity = owner.configurationActivity();
		} else {
		// Otherwise, look for a condition provider service for the rule's package
		ComponentInfo ci = approvedServiceFinder.apply(zenMode.getRule().getOwner());
		ComponentInfo ci = approvedServiceFinder.apply(owner.conditionProvider());
		if (ci != null) {
		configActivity = extractConfigurationActivityFromComponent(ci);
		}
		}

		if (configActivity != null
		&& (owner == null \|\| isSameOwnerPackage(owner, configActivity))
		&& (owner.packageName() == null
		\|\| isSameOwnerPackage(owner.packageName(), configActivity))
		&& isResolvableActivity(configActivity)) {
		return new Intent()
		.setComponent(configActivity)

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ class ZenModeButtonPreferenceController extends AbstractZenModePreferenceControl
		@Override
		public boolean isAvailable(ZenMode zenMode) {
		return zenMode.isEnabled()
		&& (zenMode.isActive() \|\| zenMode.getRule().isManualInvocationAllowed());
		&& (zenMode.isActive() \|\| zenMode.isManualInvocationAllowed());
		}

		@Override

+2 −2

Original line number	Diff line number	Diff line
		@@ -54,8 +54,8 @@ public class ZenModeEditNameIconFragment extends ZenModeEditNameIconFragmentBase
		return;
		}

		modeToUpdate.getRule().setName(mode.getRule().getName());
		modeToUpdate.getRule().setIconResId(mode.getRule().getIconResId());
		modeToUpdate.setName(mode.getName());
		modeToUpdate.setIconResId(mode.getIconResId());
		requireBackend().updateMode(modeToUpdate);
		finish();
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -128,13 +128,13 @@ public abstract class ZenModeEditNameIconFragmentBase extends DashboardFragment

		@VisibleForTesting
		final void setModeName(String name) {
		checkNotNull(mZenMode).getRule().setName(Strings.nullToEmpty(name));
		checkNotNull(mZenMode).setName(Strings.nullToEmpty(name));
		forceUpdatePreferences(); // Updates confirmation button.
		}

		@VisibleForTesting
		final void setModeIcon(@DrawableRes int iconResId) {
		checkNotNull(mZenMode).getRule().setIconResId(iconResId);
		checkNotNull(mZenMode).setIconResId(iconResId);
		forceUpdatePreferences(); // Updates icon at the top.
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.settings.notification.modes;

		import static com.google.common.base.Preconditions.checkNotNull;

		import android.content.Context;
		import android.service.notification.ZenModeConfig;

		@@ -24,6 +26,7 @@ import androidx.preference.Preference;
		import androidx.preference.TwoStatePreference;

		import com.android.settingslib.notification.modes.ZenMode;
		import com.android.settingslib.notification.modes.ZenModeSchedules;
		import com.android.settingslib.notification.modes.ZenModesBackend;

		/**
		@@ -40,7 +43,7 @@ class ZenModeExitAtAlarmPreferenceController extends

		@Override
		public void updateState(Preference preference, @NonNull ZenMode zenMode) {
		mSchedule = ZenModeConfig.tryParseScheduleConditionId(zenMode.getRule().getConditionId());
		mSchedule = checkNotNull(ZenModeSchedules.getTimeSchedule(zenMode));
		((TwoStatePreference) preference).setChecked(mSchedule.exitAtAlarm);
		}