PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix missing mode title and menu" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-01-23 05:53:54 -08:00
committed by Android (Google) Code Review
parent f956509b8c a588f3ebc4
commit 3114fdfaa4
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/notification/modes/ZenModeFragment.java
View File

@@ -95,14 +95,6 @@ public class ZenModeFragment extends ZenModeFragmentBase {
return;
}
// Set title for the entire screen
ComponentActivity activity = getActivity();
if (mode != null && activity != null) {
activity.setTitle(mode.getName());
mModeMenuProvider = new ModeMenuProvider(mode);
activity.addMenuProvider(mModeMenuProvider);
}
// allow duration preference controller to listen for settings changes
use(ManualDurationPreferenceController.class).registerSettingsObserver();
mSettingsObserverRegistered = true;
@@ -120,10 +112,27 @@ public class ZenModeFragment extends ZenModeFragmentBase {
}
@Override
public void onStop() {
public void onResume() {
super.onResume();
ZenMode mode = getMode();
ComponentActivity activity = getActivity();
if (mode != null && activity != null) {
activity.setTitle(mode.getName());
mModeMenuProvider = new ModeMenuProvider(mode);
activity.addMenuProvider(mModeMenuProvider);
}
}
@Override
public void onPause() {
if (getActivity() != null && mModeMenuProvider != null) {
getActivity().removeMenuProvider(mModeMenuProvider);
}
super.onPause();
}
@Override
public void onStop() {
if (mSettingsObserverRegistered) {
use(ManualDurationPreferenceController.class).unregisterSettingsObserver();
}