Merge "Quick fix to Modes Special Access page titles" into main

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

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();
     }