Fix missing mode title and menu
By moving these from onStart to onResume. Looks like a recent change to Settings broke this. Bug: 391543900 Test: manual Flag: EXEMPT Trivial bugfix Change-Id: Ie9b8bd08e8513e7c6c2f1baeab4801af2fbe1cae
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
Reference in New Issue
Block a user