From df3e6a1572f6b41f07aaf522f17b69314afe179d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Hern=C3=A1ndez?= Date: Mon, 27 Jan 2025 16:41:01 +0100 Subject: [PATCH] Quick fix to Modes Special Access page titles Fixes: 392594926 Test: manual Flag: EXEMPT Minor fix Change-Id: Id5294c41a3c515ce9ae7fef768c1693ade0f8191 --- .../specialaccess/zenaccess/ZenAccessDetails.java | 9 +++++++-- .../settings/notification/zen/ZenAccessSettings.java | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java index 74903c03f91..9e71f7a4020 100644 --- a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java +++ b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java @@ -44,11 +44,16 @@ public class ZenAccessDetails extends AppInfoWithHeader implements public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.zen_access_permission_details); + getSettingsLifecycle().addObserver( + new ZenAccessSettingObserverMixin(getContext(), this /* listener */)); + } + + @Override + public void onResume() { + super.onResume(); requireActivity().setTitle(Flags.modesApi() && Flags.modesUi() ? R.string.manage_zen_modes_access_title : R.string.manage_zen_access_title); - getSettingsLifecycle().addObserver( - new ZenAccessSettingObserverMixin(getContext(), this /* listener */)); } @Override diff --git a/src/com/android/settings/notification/zen/ZenAccessSettings.java b/src/com/android/settings/notification/zen/ZenAccessSettings.java index 4b598db0ae7..ebf91bf0284 100644 --- a/src/com/android/settings/notification/zen/ZenAccessSettings.java +++ b/src/com/android/settings/notification/zen/ZenAccessSettings.java @@ -69,9 +69,6 @@ public class ZenAccessSettings extends EmptyTextSettings implements mContext = getActivity(); mPkgMan = mContext.getPackageManager(); mNoMan = mContext.getSystemService(NotificationManager.class); - requireActivity().setTitle(Flags.modesApi() && Flags.modesUi() - ? R.string.manage_zen_modes_access_title - : R.string.manage_zen_access_title); getSettingsLifecycle().addObserver( new ZenAccessSettingObserverMixin(getContext(), this /* listener */)); } @@ -92,6 +89,9 @@ public class ZenAccessSettings extends EmptyTextSettings implements @Override public void onResume() { super.onResume(); + requireActivity().setTitle(Flags.modesApi() && Flags.modesUi() + ? R.string.manage_zen_modes_access_title + : R.string.manage_zen_access_title); reloadList(); }