Merge "fix(magnification): make always on toggle unavailable when capabilities is window only" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
27607a47a5
@@ -266,6 +266,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
|
||||
defaultValue
|
||||
);
|
||||
}
|
||||
|
||||
private void addAlwaysOnSetting(PreferenceCategory generalCategory) {
|
||||
if (!isAlwaysOnSettingEnabled()) {
|
||||
return;
|
||||
@@ -282,6 +283,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
|
||||
|
||||
var alwaysOnPreferenceController = new MagnificationAlwaysOnPreferenceController(
|
||||
getContext(), MagnificationAlwaysOnPreferenceController.PREF_KEY);
|
||||
getSettingsLifecycle().addObserver(alwaysOnPreferenceController);
|
||||
alwaysOnPreferenceController.displayPreference(getPreferenceScreen());
|
||||
addPreferenceController(alwaysOnPreferenceController);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user