Merge "Add log for enable/disable zen mode" into main
diff --git a/src/com/android/settings/notification/modes/AbstractZenModePreferenceController.java b/src/com/android/settings/notification/modes/AbstractZenModePreferenceController.java
index c473456..b27292a 100644
--- a/src/com/android/settings/notification/modes/AbstractZenModePreferenceController.java
+++ b/src/com/android/settings/notification/modes/AbstractZenModePreferenceController.java
@@ -28,7 +28,9 @@
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 @@
@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 @@
super(context);
mKey = key;
mBackend = null;
+ mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
}
/**
@@ -71,6 +75,7 @@
super(context);
mKey = key;
mBackend = backend;
+ mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
}
@Override
@@ -79,6 +84,11 @@
return mKey;
}
+ @NonNull
+ public MetricsFeatureProvider getMetricsFeatureProvider() {
+ return mMetricsFeatureProvider;
+ }
+
@Override
public boolean isAvailable() {
if (mZenMode != null) {
diff --git a/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java b/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java
index 1add488..f2302c0 100644
--- a/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java
@@ -218,6 +218,8 @@
}
return zenMode;
});
+ getMetricsFeatureProvider().action(mContext, SettingsEnums.ACTION_ZEN_MODE_ENABLE_TOGGLE,
+ enabled);
}
private void undoToggleSwitch(Preference preference, boolean wasSwitchedTo) {