[Catalyst] Migrate "Lock screen" entry point

Bug: 372307567
Flag: com.android.settings.flags.catalyst_lockscreen_from_display_settings
Test: manual
Change-Id: I0c269c550c678362f345c9b5438a133c7a76fe10
This commit is contained in:
Jacky Wang
2024-11-20 19:08:26 +08:00
parent 9b65eafc84
commit b6132572ea
4 changed files with 25 additions and 11 deletions

View File

@@ -427,6 +427,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
private void removeControllersForHybridMode() {
Set<String> keys = getPreferenceKeysInHierarchy();
Iterator<AbstractPreferenceController> iterator = mControllers.iterator();
Lifecycle lifecycle = getSettingsLifecycle();
while (iterator.hasNext()) {
AbstractPreferenceController controller = iterator.next();
String key = controller.getPreferenceKey();
@@ -438,6 +439,9 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
if (controllers != null) {
controllers.remove(controller);
}
if (controller instanceof LifecycleObserver) {
lifecycle.removeObserver((LifecycleObserver) controller);
}
}
}
}