diff --git a/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java b/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java index 200a47b54eb..778c788e4c8 100644 --- a/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java +++ b/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java @@ -226,7 +226,10 @@ public class AppChannelsBypassingDndPreferenceController extends NotificationPre .setArguments(channelArgs) .setUserHandle(UserHandle.of(mAppRow.userId)) .setTitleRes(com.android.settings.R.string.notification_channel_title) - .setSourceMetricsCategory(SettingsEnums.DND_APPS_BYPASSING) + .setSourceMetricsCategory( + android.app.Flags.modesUi() + ? SettingsEnums.NOTIFICATION_ZEN_MODE_OVERRIDING_APP_CHANNELS + : SettingsEnums.DND_APPS_BYPASSING) .launch(); return true; }); diff --git a/src/com/android/settings/notification/app/AppChannelsBypassingDndSettings.java b/src/com/android/settings/notification/app/AppChannelsBypassingDndSettings.java index 4fab7e277ea..b5e2b130b27 100644 --- a/src/com/android/settings/notification/app/AppChannelsBypassingDndSettings.java +++ b/src/com/android/settings/notification/app/AppChannelsBypassingDndSettings.java @@ -40,7 +40,9 @@ public class AppChannelsBypassingDndSettings extends NotificationSettings { @Override public int getMetricsCategory() { - return SettingsEnums.DND_APPS_BYPASSING; + return android.app.Flags.modesUi() + ? SettingsEnums.NOTIFICATION_ZEN_MODE_OVERRIDING_APP_CHANNELS + : SettingsEnums.DND_APPS_BYPASSING; } @Override diff --git a/src/com/android/settings/notification/modes/SetupInterstitialActivity.java b/src/com/android/settings/notification/modes/SetupInterstitialActivity.java index f26de76844b..830baaf7bfa 100644 --- a/src/com/android/settings/notification/modes/SetupInterstitialActivity.java +++ b/src/com/android/settings/notification/modes/SetupInterstitialActivity.java @@ -25,6 +25,7 @@ import static android.app.AutomaticZenRule.TYPE_THEATER; import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID; import android.app.ActionBar; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -164,7 +165,8 @@ public class SetupInterstitialActivity extends FragmentActivity { // they happen to go back. Forward the activity result in case we got here (indirectly) // from some app that is waiting for the result. if (updated) { - ZenSubSettingLauncher.forMode(this, modeId) + ZenSubSettingLauncher.forModeFragment(this, ZenModeFragment.class, modeId, + SettingsEnums.ZEN_MODE_INTERSTITIAL) .addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT).launch(); } finish(); diff --git a/src/com/android/settings/notification/modes/ZenModeAppsFragment.java b/src/com/android/settings/notification/modes/ZenModeAppsFragment.java index 19035ddcf78..ec72c83f3a5 100644 --- a/src/com/android/settings/notification/modes/ZenModeAppsFragment.java +++ b/src/com/android/settings/notification/modes/ZenModeAppsFragment.java @@ -47,7 +47,6 @@ public class ZenModeAppsFragment extends ZenModeFragmentBase { @Override public int getMetricsCategory() { - // TODO: b/332937635 - make this the correct metrics category - return SettingsEnums.NOTIFICATION_ZEN_MODE_PRIORITY; + return SettingsEnums.NOTIFICATION_ZEN_MODE_OVERRIDING_APPS; } } diff --git a/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceController.java index 1521a8b4f09..84d3c09a628 100644 --- a/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceController.java +++ b/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceController.java @@ -20,6 +20,7 @@ import static android.app.NotificationManager.INTERRUPTION_FILTER_ALL; import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID; import android.app.Application; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; @@ -93,10 +94,9 @@ class ZenModeAppsLinkPreferenceController extends AbstractZenModePreferenceContr public void updateState(Preference preference, @NonNull ZenMode zenMode) { Bundle bundle = new Bundle(); bundle.putString(EXTRA_AUTOMATIC_ZEN_RULE_ID, zenMode.getId()); - // TODO(b/332937635): Update metrics category preference.setIntent( ZenSubSettingLauncher.forModeFragment(mContext, ZenModeAppsFragment.class, - zenMode.getId(), 0).toIntent()); + zenMode.getId(), SettingsEnums.ZEN_PRIORITY_MODE).toIntent()); preference.setEnabled(zenMode.isEnabled()); mZenMode = zenMode; diff --git a/src/com/android/settings/notification/modes/ZenModeAppsPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeAppsPreferenceController.java index 522f191c37f..c44661a9d09 100644 --- a/src/com/android/settings/notification/modes/ZenModeAppsPreferenceController.java +++ b/src/com/android/settings/notification/modes/ZenModeAppsPreferenceController.java @@ -106,10 +106,9 @@ public class ZenModeAppsPreferenceController extends if (mModeId != null) { bundle.putString(EXTRA_AUTOMATIC_ZEN_RULE_ID, mModeId); } - // TODO(b/332937635): Update metrics category new SubSettingLauncher(mContext) .setDestination(ZenModeSelectBypassingAppsFragment.class.getName()) - .setSourceMetricsCategory(SettingsEnums.SETTINGS_ZEN_NOTIFICATIONS) + .setSourceMetricsCategory(SettingsEnums.NOTIFICATION_ZEN_MODE_OVERRIDING_APPS) .setArguments(bundle) .launch(); } diff --git a/src/com/android/settings/notification/modes/ZenModeCallsFragment.java b/src/com/android/settings/notification/modes/ZenModeCallsFragment.java index 54072ac185a..ac05328d2d3 100644 --- a/src/com/android/settings/notification/modes/ZenModeCallsFragment.java +++ b/src/com/android/settings/notification/modes/ZenModeCallsFragment.java @@ -50,7 +50,6 @@ public class ZenModeCallsFragment extends ZenModeFragmentBase { @Override public int getMetricsCategory() { - // TODO: b/332937635 - make this the correct metrics category return SettingsEnums.DND_CALLS; } diff --git a/src/com/android/settings/notification/modes/ZenModeCallsLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeCallsLinkPreferenceController.java index d8850191762..efddcf9e23a 100644 --- a/src/com/android/settings/notification/modes/ZenModeCallsLinkPreferenceController.java +++ b/src/com/android/settings/notification/modes/ZenModeCallsLinkPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification.modes; import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; @@ -41,10 +42,9 @@ class ZenModeCallsLinkPreferenceController extends AbstractZenModePreferenceCont public void updateState(Preference preference, @NonNull ZenMode zenMode) { Bundle bundle = new Bundle(); bundle.putString(EXTRA_AUTOMATIC_ZEN_RULE_ID, zenMode.getId()); - // TODO(b/332937635): Update metrics category preference.setIntent(new SubSettingLauncher(mContext) .setDestination(ZenModeCallsFragment.class.getName()) - .setSourceMetricsCategory(0) + .setSourceMetricsCategory(SettingsEnums.DND_PEOPLE) .setArguments(bundle) .toIntent()); preference.setSummary(mSummaryHelper.getCallsSettingSummary(zenMode)); diff --git a/src/com/android/settings/notification/modes/ZenModeDisplayFragment.java b/src/com/android/settings/notification/modes/ZenModeDisplayFragment.java index 38ac8f31072..74ed38f96bd 100644 --- a/src/com/android/settings/notification/modes/ZenModeDisplayFragment.java +++ b/src/com/android/settings/notification/modes/ZenModeDisplayFragment.java @@ -54,7 +54,6 @@ public class ZenModeDisplayFragment extends ZenModeFragmentBase { @Override public int getMetricsCategory() { - // TODO: b/332937635 - make this the correct metrics category - return SettingsEnums.DND_PEOPLE; + return SettingsEnums.ZEN_MODE_DISPLAY_SETTINGS; } } diff --git a/src/com/android/settings/notification/modes/ZenModeDisplayLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeDisplayLinkPreferenceController.java index bba5e342732..57dce89a35c 100644 --- a/src/com/android/settings/notification/modes/ZenModeDisplayLinkPreferenceController.java +++ b/src/com/android/settings/notification/modes/ZenModeDisplayLinkPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification.modes; import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; @@ -41,10 +42,9 @@ class ZenModeDisplayLinkPreferenceController extends AbstractZenModePreferenceCo void updateState(Preference preference, @NonNull ZenMode zenMode) { Bundle bundle = new Bundle(); bundle.putString(EXTRA_AUTOMATIC_ZEN_RULE_ID, zenMode.getId()); - // TODO(b/332937635): Update metrics category preference.setIntent( ZenSubSettingLauncher.forModeFragment(mContext, ZenModeDisplayFragment.class, - zenMode.getId(), 0).toIntent()); + zenMode.getId(), SettingsEnums.ZEN_PRIORITY_MODE).toIntent()); preference.setEnabled(zenMode.isEnabled()); } diff --git a/src/com/android/settings/notification/modes/ZenModeEditNameIconFragment.java b/src/com/android/settings/notification/modes/ZenModeEditNameIconFragment.java index a0c2cf1109b..60f731627f8 100644 --- a/src/com/android/settings/notification/modes/ZenModeEditNameIconFragment.java +++ b/src/com/android/settings/notification/modes/ZenModeEditNameIconFragment.java @@ -72,8 +72,7 @@ public class ZenModeEditNameIconFragment extends ZenModeEditNameIconFragmentBase @Override public int getMetricsCategory() { - // TODO: b/332937635 - make this the correct metrics category - return SettingsEnums.NOTIFICATION_ZEN_MODE_AUTOMATION; + return SettingsEnums.ZEN_MODE_EDIT_NAME_ICON; } @Override diff --git a/src/com/android/settings/notification/modes/ZenModeFragment.java b/src/com/android/settings/notification/modes/ZenModeFragment.java index 0a80977a021..37772990152 100644 --- a/src/com/android/settings/notification/modes/ZenModeFragment.java +++ b/src/com/android/settings/notification/modes/ZenModeFragment.java @@ -129,8 +129,7 @@ public class ZenModeFragment extends ZenModeFragmentBase { @Override public int getMetricsCategory() { - // TODO: b/332937635 - make this the correct metrics category - return SettingsEnums.NOTIFICATION_ZEN_MODE_AUTOMATION; + return SettingsEnums.ZEN_PRIORITY_MODE; } @Override @@ -164,9 +163,8 @@ public class ZenModeFragment extends ZenModeFragmentBase { @Override public boolean onMenuItemSelected(@NonNull MenuItem menuItem) { if (menuItem.getItemId() == RENAME_MODE) { - // TODO: b/332937635 - Update metrics category ZenSubSettingLauncher.forModeFragment(mContext, ZenModeEditNameIconFragment.class, - mZenMode.getId(), 0).launch(); + mZenMode.getId(), getMetricsCategory()).launch(); } else if (menuItem.getItemId() == DELETE_MODE) { new AlertDialog.Builder(mContext) .setTitle(mContext.getString(R.string.zen_mode_delete_mode_confirmation, diff --git a/src/com/android/settings/notification/modes/ZenModeMessagesFragment.java b/src/com/android/settings/notification/modes/ZenModeMessagesFragment.java index 8bf574f4ced..709e5da03df 100644 --- a/src/com/android/settings/notification/modes/ZenModeMessagesFragment.java +++ b/src/com/android/settings/notification/modes/ZenModeMessagesFragment.java @@ -46,7 +46,6 @@ public class ZenModeMessagesFragment extends ZenModeFragmentBase { @Override public int getMetricsCategory() { - // TODO: b/332937635 - make this the correct metrics category return SettingsEnums.DND_MESSAGES; } diff --git a/src/com/android/settings/notification/modes/ZenModeMessagesLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeMessagesLinkPreferenceController.java index 4c0b758e7cb..50d7958120b 100644 --- a/src/com/android/settings/notification/modes/ZenModeMessagesLinkPreferenceController.java +++ b/src/com/android/settings/notification/modes/ZenModeMessagesLinkPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification.modes; import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; @@ -40,10 +41,9 @@ class ZenModeMessagesLinkPreferenceController extends AbstractZenModePreferenceC public void updateState(Preference preference, @NonNull ZenMode zenMode) { Bundle bundle = new Bundle(); bundle.putString(EXTRA_AUTOMATIC_ZEN_RULE_ID, zenMode.getId()); - // TODO(b/332937635): Update metrics category preference.setIntent(new SubSettingLauncher(mContext) .setDestination(ZenModeMessagesFragment.class.getName()) - .setSourceMetricsCategory(0) + .setSourceMetricsCategory(SettingsEnums.DND_PEOPLE) .setArguments(bundle) .toIntent()); diff --git a/src/com/android/settings/notification/modes/ZenModeNewCustomFragment.java b/src/com/android/settings/notification/modes/ZenModeNewCustomFragment.java index 6086c0c7b38..d7dbaaf8702 100644 --- a/src/com/android/settings/notification/modes/ZenModeNewCustomFragment.java +++ b/src/com/android/settings/notification/modes/ZenModeNewCustomFragment.java @@ -16,6 +16,8 @@ package com.android.settings.notification.modes; +import android.app.settings.SettingsEnums; + import androidx.annotation.Nullable; import com.android.settings.R; @@ -50,15 +52,15 @@ public class ZenModeNewCustomFragment extends ZenModeEditNameIconFragmentBase { if (created != null) { // Open the mode view fragment and close the "add mode" fragment, so exiting the mode // view goes back to previous screen (which should be the modes list). - ZenSubSettingLauncher.forMode(requireContext(), created.getId()).launch(); + ZenSubSettingLauncher.forModeFragment(requireContext(), ZenModeFragment.class, + created.getId(), getMetricsCategory()).launch(); finish(); } } @Override public int getMetricsCategory() { - // TODO: b/332937635 - make this the correct metrics category - return 0; + return SettingsEnums.ZEN_MODE_ADD_NEW; } @Override diff --git a/src/com/android/settings/notification/modes/ZenModeNotifVisFragment.java b/src/com/android/settings/notification/modes/ZenModeNotifVisFragment.java index 3fdfec6e106..d1bd493482a 100644 --- a/src/com/android/settings/notification/modes/ZenModeNotifVisFragment.java +++ b/src/com/android/settings/notification/modes/ZenModeNotifVisFragment.java @@ -19,6 +19,7 @@ package com.android.settings.notification.modes; import android.app.settings.SettingsEnums; import android.content.Context; import android.service.notification.ZenPolicy; + import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; @@ -57,7 +58,6 @@ public class ZenModeNotifVisFragment extends ZenModeFragmentBase { @Override public int getMetricsCategory() { - // TODO: b/332937635 - make this the correct metrics category - return SettingsEnums.DND_PEOPLE; + return SettingsEnums.ZEN_CUSTOM_RULE_VIS_EFFECTS; } } diff --git a/src/com/android/settings/notification/modes/ZenModeNotifVisLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeNotifVisLinkPreferenceController.java index 622c4a2db48..cd1e8c7d3ba 100644 --- a/src/com/android/settings/notification/modes/ZenModeNotifVisLinkPreferenceController.java +++ b/src/com/android/settings/notification/modes/ZenModeNotifVisLinkPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.notification.modes; import static android.app.NotificationManager.INTERRUPTION_FILTER_ALL; import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; @@ -47,10 +48,9 @@ class ZenModeNotifVisLinkPreferenceController extends AbstractZenModePreferenceC public void updateState(Preference preference, @NonNull ZenMode zenMode) { Bundle bundle = new Bundle(); bundle.putString(EXTRA_AUTOMATIC_ZEN_RULE_ID, zenMode.getId()); - // TODO(b/332937635): Update metrics category preference.setIntent(new SubSettingLauncher(mContext) .setDestination(ZenModeNotifVisFragment.class.getName()) - .setSourceMetricsCategory(0) + .setSourceMetricsCategory(SettingsEnums.ZEN_MODE_DISPLAY_SETTINGS) .setArguments(bundle) .toIntent()); } diff --git a/src/com/android/settings/notification/modes/ZenModeOtherFragment.java b/src/com/android/settings/notification/modes/ZenModeOtherFragment.java index 1149cd1312f..28b2e54d3a6 100644 --- a/src/com/android/settings/notification/modes/ZenModeOtherFragment.java +++ b/src/com/android/settings/notification/modes/ZenModeOtherFragment.java @@ -16,14 +16,9 @@ package com.android.settings.notification.modes; -import static android.service.notification.ZenPolicy.PRIORITY_CATEGORY_ALARMS; -import static android.service.notification.ZenPolicy.PRIORITY_CATEGORY_EVENTS; -import static android.service.notification.ZenPolicy.PRIORITY_CATEGORY_MEDIA; -import static android.service.notification.ZenPolicy.PRIORITY_CATEGORY_REMINDERS; -import static android.service.notification.ZenPolicy.PRIORITY_CATEGORY_SYSTEM; - import android.app.settings.SettingsEnums; import android.content.Context; + import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; @@ -58,7 +53,6 @@ public class ZenModeOtherFragment extends ZenModeFragmentBase { @Override public int getMetricsCategory() { - // TODO: b/332937635 - make this the correct metrics category return SettingsEnums.NOTIFICATION_ZEN_MODE_PRIORITY; } } diff --git a/src/com/android/settings/notification/modes/ZenModeOtherLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeOtherLinkPreferenceController.java index 15e0edcf1df..5b26364c938 100644 --- a/src/com/android/settings/notification/modes/ZenModeOtherLinkPreferenceController.java +++ b/src/com/android/settings/notification/modes/ZenModeOtherLinkPreferenceController.java @@ -23,6 +23,7 @@ import static android.service.notification.ZenPolicy.PRIORITY_CATEGORY_MEDIA; import static android.service.notification.ZenPolicy.PRIORITY_CATEGORY_REMINDERS; import static android.service.notification.ZenPolicy.PRIORITY_CATEGORY_SYSTEM; +import android.app.settings.SettingsEnums; import android.content.Context; import android.service.notification.ZenPolicy; @@ -65,10 +66,9 @@ class ZenModeOtherLinkPreferenceController extends AbstractZenModePreferenceCont @Override public void updateState(Preference preference, @NonNull ZenMode zenMode) { - // TODO: b/332937635 - Update metrics category preference.setIntent( ZenSubSettingLauncher.forModeFragment(mContext, ZenModeOtherFragment.class, - zenMode.getId(), 0).toIntent()); + zenMode.getId(), SettingsEnums.ZEN_PRIORITY_MODE).toIntent()); preference.setEnabled(zenMode.isEnabled()); preference.setSummary(mSummaryHelper.getOtherSoundCategoriesSummary(zenMode)); diff --git a/src/com/android/settings/notification/modes/ZenModePeopleFragment.java b/src/com/android/settings/notification/modes/ZenModePeopleFragment.java index f541d132010..11e4453ddef 100644 --- a/src/com/android/settings/notification/modes/ZenModePeopleFragment.java +++ b/src/com/android/settings/notification/modes/ZenModePeopleFragment.java @@ -48,7 +48,6 @@ public class ZenModePeopleFragment extends ZenModeFragmentBase { @Override public int getMetricsCategory() { - // TODO: b/332937635 - make this the correct metrics category return SettingsEnums.DND_PEOPLE; } } diff --git a/src/com/android/settings/notification/modes/ZenModePeopleLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModePeopleLinkPreferenceController.java index 4610c35ca82..9aad4603588 100644 --- a/src/com/android/settings/notification/modes/ZenModePeopleLinkPreferenceController.java +++ b/src/com/android/settings/notification/modes/ZenModePeopleLinkPreferenceController.java @@ -26,6 +26,7 @@ import static android.service.notification.ZenPolicy.PEOPLE_TYPE_NONE; import static android.service.notification.ZenPolicy.PEOPLE_TYPE_STARRED; import static android.service.notification.ZenPolicy.STATE_ALLOW; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.pm.LauncherApps; import android.graphics.drawable.Drawable; @@ -88,10 +89,10 @@ class ZenModePeopleLinkPreferenceController extends AbstractZenModePreferenceCon @Override public void updateState(Preference preference, @NonNull ZenMode zenMode) { - // TODO(b/332937635): Update metrics category + // Passes in source ZenModeFragment metric category. preference.setIntent( ZenSubSettingLauncher.forModeFragment(mContext, ZenModePeopleFragment.class, - zenMode.getId(), 0).toIntent()); + zenMode.getId(), SettingsEnums.ZEN_PRIORITY_MODE).toIntent()); preference.setEnabled(zenMode.isEnabled()); preference.setSummary(mSummaryHelper.getPeopleSummary(zenMode.getPolicy())); diff --git a/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceController.java b/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceController.java index ab5e2d9e56b..11b65bd21f5 100644 --- a/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceController.java +++ b/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceController.java @@ -270,10 +270,9 @@ class ZenModePrioritySendersPreferenceController mContext.startActivity(ALL_CONTACTS_INTENT); } else if (KEY_ANY_CONVERSATIONS.equals(key) || KEY_IMPORTANT_CONVERSATIONS.equals(key)) { - // TODO: b/332937635 - set correct metrics category new SubSettingLauncher(mContext) .setDestination(ConversationListSettings.class.getName()) - .setSourceMetricsCategory(SettingsEnums.DND_CONVERSATIONS) + .setSourceMetricsCategory(SettingsEnums.DND_MESSAGES) .launch(); } else { mContext.startActivity(FALLBACK_INTENT); diff --git a/src/com/android/settings/notification/modes/ZenModeScheduleChooserDialog.java b/src/com/android/settings/notification/modes/ZenModeScheduleChooserDialog.java index 6202648fcf9..d129aad6ad6 100644 --- a/src/com/android/settings/notification/modes/ZenModeScheduleChooserDialog.java +++ b/src/com/android/settings/notification/modes/ZenModeScheduleChooserDialog.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.net.Uri; import android.os.Bundle; @@ -70,8 +71,7 @@ public class ZenModeScheduleChooserDialog extends InstrumentedDialogFragment { @Override public int getMetricsCategory() { - // TODO: b/332937635 - Update metrics category - return 0; + return SettingsEnums.ZEN_SCHEDULE_CHOOSER_DIALOG; } static void show(DashboardFragment parent, OnScheduleOptionListener optionListener) { diff --git a/src/com/android/settings/notification/modes/ZenModeSelectBypassingAppsFragment.java b/src/com/android/settings/notification/modes/ZenModeSelectBypassingAppsFragment.java index 8b682b92f1a..1f5438d08eb 100644 --- a/src/com/android/settings/notification/modes/ZenModeSelectBypassingAppsFragment.java +++ b/src/com/android/settings/notification/modes/ZenModeSelectBypassingAppsFragment.java @@ -74,8 +74,7 @@ public class ZenModeSelectBypassingAppsFragment extends ZenModeFragmentBase impl @Override public int getMetricsCategory() { - // TODO(b/332937635): Update metrics category - return SettingsEnums.NOTIFICATION_ZEN_MODE_OVERRIDING_APPS; + return SettingsEnums.NOTIFICATION_ZEN_MODE_OVERRIDING_APP; } /** diff --git a/src/com/android/settings/notification/modes/ZenModeSetCalendarFragment.java b/src/com/android/settings/notification/modes/ZenModeSetCalendarFragment.java index f0206ef5dad..a266c8b1637 100644 --- a/src/com/android/settings/notification/modes/ZenModeSetCalendarFragment.java +++ b/src/com/android/settings/notification/modes/ZenModeSetCalendarFragment.java @@ -46,7 +46,6 @@ public class ZenModeSetCalendarFragment extends ZenModeFragmentBase { @Override public int getMetricsCategory() { - // TODO: b/332937635 - make this the correct metrics category return SettingsEnums.NOTIFICATION_ZEN_MODE_EVENT_RULE; } } diff --git a/src/com/android/settings/notification/modes/ZenModeSetScheduleFragment.java b/src/com/android/settings/notification/modes/ZenModeSetScheduleFragment.java index 4d58097b1dc..91197845874 100644 --- a/src/com/android/settings/notification/modes/ZenModeSetScheduleFragment.java +++ b/src/com/android/settings/notification/modes/ZenModeSetScheduleFragment.java @@ -48,7 +48,6 @@ public class ZenModeSetScheduleFragment extends ZenModeFragmentBase { @Override public int getMetricsCategory() { - // TODO: b/332937635 - make this the correct metrics category return SettingsEnums.NOTIFICATION_ZEN_MODE_SCHEDULE_RULE; } } diff --git a/src/com/android/settings/notification/modes/ZenModeTimePickerFragment.java b/src/com/android/settings/notification/modes/ZenModeTimePickerFragment.java index d8e1b38875b..3fa53946477 100644 --- a/src/com/android/settings/notification/modes/ZenModeTimePickerFragment.java +++ b/src/com/android/settings/notification/modes/ZenModeTimePickerFragment.java @@ -62,7 +62,6 @@ public class ZenModeTimePickerFragment extends InstrumentedDialogFragment implem @Override public int getMetricsCategory() { - // TODO: b/332937635 - set correct metrics category (or decide to keep this one?) return SettingsEnums.DIALOG_ZEN_TIMEPICKER; } diff --git a/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java b/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java index 885c4db1fa1..1add4889c66 100644 --- a/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java +++ b/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java @@ -24,6 +24,7 @@ import static android.service.notification.ZenModeConfig.tryParseScheduleConditi import android.annotation.SuppressLint; import android.app.AlertDialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -97,9 +98,9 @@ class ZenModeTriggerUpdatePreferenceController extends AbstractZenModePreference private void setUpForSystemOwnedTrigger(Preference preference, ZenMode mode) { if (mode.getType() == TYPE_SCHEDULE_TIME) { - // TODO: b/332937635 - set correct metrics category preference.setIntent(ZenSubSettingLauncher.forModeFragment(mContext, - ZenModeSetScheduleFragment.class, mode.getId(), 0).toIntent()); + ZenModeSetScheduleFragment.class, mode.getId(), + SettingsEnums.ZEN_PRIORITY_MODE).toIntent()); // [Clock Icon] 9:00 - 17:00 / Sun-Mon preference.setIcon(com.android.internal.R.drawable.ic_zen_mode_type_schedule_time); @@ -115,9 +116,9 @@ class ZenModeTriggerUpdatePreferenceController extends AbstractZenModePreference preference.setSummary(null); } } else if (mode.getType() == TYPE_SCHEDULE_CALENDAR) { - // TODO: b/332937635 - set correct metrics category preference.setIntent(ZenSubSettingLauncher.forModeFragment(mContext, - ZenModeSetCalendarFragment.class, mode.getId(), 0).toIntent()); + ZenModeSetCalendarFragment.class, mode.getId(), + SettingsEnums.ZEN_PRIORITY_MODE).toIntent()); // [Event Icon] Calendar Events / preference.setIcon( diff --git a/src/com/android/settings/notification/modes/ZenModesListAddModeTypeChooserDialog.java b/src/com/android/settings/notification/modes/ZenModesListAddModeTypeChooserDialog.java index 57d3bf96c2b..e7905a8f936 100644 --- a/src/com/android/settings/notification/modes/ZenModesListAddModeTypeChooserDialog.java +++ b/src/com/android/settings/notification/modes/ZenModesListAddModeTypeChooserDialog.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import android.app.Dialog; +import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; @@ -56,8 +57,7 @@ public class ZenModesListAddModeTypeChooserDialog extends InstrumentedDialogFrag @Override public int getMetricsCategory() { - // TODO: b/332937635 - Update metrics category - return 0; + return SettingsEnums.ZEN_MODE_NEW_TYPE_CHOOSER_DIALOG; } static void show(DashboardFragment parent, diff --git a/src/com/android/settings/notification/modes/ZenModesListFragment.java b/src/com/android/settings/notification/modes/ZenModesListFragment.java index cab0209e06c..2b58f8e1c3b 100644 --- a/src/com/android/settings/notification/modes/ZenModesListFragment.java +++ b/src/com/android/settings/notification/modes/ZenModesListFragment.java @@ -74,8 +74,7 @@ public class ZenModesListFragment extends ZenModesFragmentBase { @Override public int getMetricsCategory() { - // TODO: b/332937635 - add new & set metrics categories correctly - return SettingsEnums.NOTIFICATION_ZEN_MODE_AUTOMATION; + return SettingsEnums.ZEN_PRIORITY_MODES_LIST; } private void onAvailableModeTypesForAdd(List types) { @@ -97,10 +96,9 @@ public class ZenModesListFragment extends ZenModesFragmentBase { startActivityForResult(type.creationActivityIntent(), REQUEST_NEW_MODE); } else { // Custom-manual mode -> "add a mode" screen. - // TODO: b/332937635 - set metrics categories correctly new SubSettingLauncher(requireContext()) .setDestination(ZenModeNewCustomFragment.class.getName()) - .setSourceMetricsCategory(0) + .setSourceMetricsCategory(SettingsEnums.ZEN_PRIORITY_MODES_LIST) .launch(); } } @@ -125,7 +123,9 @@ public class ZenModesListFragment extends ZenModesFragmentBase { .filter(m -> m.getRule().getPackageName().equals(activityInvoked.getPackageName())) .findFirst(); createdZenMode.ifPresent( - mode -> ZenSubSettingLauncher.forMode(mContext, mode.getId()).launch()); + mode -> + ZenSubSettingLauncher.forModeFragment(mContext, ZenModeFragment.class, + mode.getId(), getMetricsCategory()).launch()); } /** diff --git a/src/com/android/settings/notification/modes/ZenModesListItemPreference.java b/src/com/android/settings/notification/modes/ZenModesListItemPreference.java index e09d04c7737..0c961481193 100644 --- a/src/com/android/settings/notification/modes/ZenModesListItemPreference.java +++ b/src/com/android/settings/notification/modes/ZenModesListItemPreference.java @@ -15,6 +15,7 @@ */ package com.android.settings.notification.modes; +import android.app.settings.SettingsEnums; import android.content.Context; import android.widget.TextView; @@ -63,7 +64,8 @@ class ZenModesListItemPreference extends RestrictedPreference { @Override public void onClick() { - ZenSubSettingLauncher.forMode(mContext, mZenMode.getId()).launch(); + ZenSubSettingLauncher.forModeFragment(mContext, ZenModeFragment.class, mZenMode.getId(), + SettingsEnums.ZEN_PRIORITY_MODES_LIST).launch(); } public void setZenMode(ZenMode zenMode) { diff --git a/src/com/android/settings/notification/modes/ZenSubSettingLauncher.java b/src/com/android/settings/notification/modes/ZenSubSettingLauncher.java index 00c21bbe4cd..c02a9d95f20 100644 --- a/src/com/android/settings/notification/modes/ZenSubSettingLauncher.java +++ b/src/com/android/settings/notification/modes/ZenSubSettingLauncher.java @@ -18,7 +18,6 @@ package com.android.settings.notification.modes; import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID; -import android.app.settings.SettingsEnums; import android.content.Context; import android.os.Bundle; @@ -26,12 +25,6 @@ import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.DashboardFragment; class ZenSubSettingLauncher { - - static SubSettingLauncher forMode(Context context, String modeId) { - return forModeFragment(context, ZenModeFragment.class, modeId, - SettingsEnums.NOTIFICATION_ZEN_MODE_AUTOMATION); - } - static SubSettingLauncher forModeFragment(Context context, Class fragmentClass, String modeId, int sourceMetricsCategory) { diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceControllerTest.java index 9263ffdb8c7..d439111946a 100644 --- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceControllerTest.java @@ -34,6 +34,7 @@ import static org.mockito.Mockito.when; import static org.robolectric.Shadows.shadowOf; import android.app.Flags; +import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -163,7 +164,7 @@ public final class ZenModeAppsLinkPreferenceControllerTest { assertThat(launcherIntent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)) .isEqualTo("com.android.settings.notification.modes.ZenModeAppsFragment"); assertThat(launcherIntent.getIntExtra(MetricsFeatureProvider.EXTRA_SOURCE_METRICS_CATEGORY, - -1)).isEqualTo(0); + -1)).isEqualTo(SettingsEnums.ZEN_PRIORITY_MODE); Bundle bundle = launcherIntent.getBundleExtra( SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);