Merge "Quick fix to Modes Special Access page titles" into main (ff58281a) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -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

+3 −3

Original line number	Diff line number	Diff line
		@@ -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();
		}