Merge "Add log for enable/disable zen mode" into main (ba055aa8) · Commits · e / os / android_packages_apps_Settings

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

+11 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,9 @@ import androidx.annotation.Nullable;
		import androidx.annotation.VisibleForTesting;
		import androidx.preference.Preference;

		import com.android.settings.overlay.FeatureFactory;
		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
		import com.android.settingslib.notification.modes.ZenMode;
		import com.android.settingslib.notification.modes.ZenModesBackend;

		@@ -43,13 +45,14 @@ abstract class AbstractZenModePreferenceController extends AbstractPreferenceCon

		@Nullable protected final ZenModesBackend mBackend;


		@Nullable // only until setZenMode() is called
		private ZenMode mZenMode;

		@NonNull
		private final String mKey;

		@NonNull private final MetricsFeatureProvider mMetricsFeatureProvider;

		/**
		* Constructor suitable for "read-only" controllers (e.g. link to a different sub-screen.
		* Controllers that call this constructor to initialize themselves <em>cannot</em> call
		@@ -59,6 +62,7 @@ abstract class AbstractZenModePreferenceController extends AbstractPreferenceCon
		super(context);
		mKey = key;
		mBackend = null;
		mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
		}

		/**
		@@ -71,6 +75,7 @@ abstract class AbstractZenModePreferenceController extends AbstractPreferenceCon
		super(context);
		mKey = key;
		mBackend = backend;
		mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
		}

		@Override
		@@ -79,6 +84,11 @@ abstract class AbstractZenModePreferenceController extends AbstractPreferenceCon
		return mKey;
		}

		@NonNull
		public MetricsFeatureProvider getMetricsFeatureProvider() {
		return mMetricsFeatureProvider;
		}

		@Override
		public boolean isAvailable() {
		if (mZenMode != null) {

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -218,6 +218,8 @@ class ZenModeTriggerUpdatePreferenceController extends AbstractZenModePreference
		}
		return zenMode;
		});
		getMetricsFeatureProvider().action(mContext, SettingsEnums.ACTION_ZEN_MODE_ENABLE_TOGGLE,
		enabled);
		}

		private void undoToggleSwitch(Preference preference, boolean wasSwitchedTo) {