[MainSwitchPreference] Deprecate SettingsMainSwitchPreferenceController

Bug: 401406987
Flag: EXEMPT refactor
Test: manual
Change-Id: Icdef50d0da777751f37b9d0d1984db636c7086f1
This commit is contained in:
Jacky Wang
2025-03-07 12:15:23 +08:00
parent 0fb23e3a7e
commit 1684b4387e
4 changed files with 38 additions and 9 deletions

View File

@@ -19,10 +19,15 @@ package com.android.settings.display;
import android.app.settings.SettingsEnums;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.view.RotationPolicy;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.SettingsMainSwitchPreferenceController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
@@ -31,17 +36,24 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
/**
* The main switch controller for auto-rotate.
*/
public class AutoRotateSwitchBarController extends SettingsMainSwitchPreferenceController implements
public class AutoRotateSwitchBarController extends TogglePreferenceController implements
LifecycleObserver, OnStart, OnStop {
private final MetricsFeatureProvider mMetricsFeatureProvider;
private RotationPolicy.RotationPolicyListener mRotationPolicyListener;
private @Nullable Preference mPreference;
public AutoRotateSwitchBarController(Context context, String key) {
super(context, key);
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
}
@Override
public void displayPreference(@NonNull PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = screen.findPreference(getPreferenceKey());
}
@Override
public int getAvailabilityStatus() {
return RotationPolicy.isRotationLockToggleVisible(mContext)
@@ -55,8 +67,8 @@ public class AutoRotateSwitchBarController extends SettingsMainSwitchPreferenceC
mRotationPolicyListener = new RotationPolicy.RotationPolicyListener() {
@Override
public void onChange() {
if (mSwitchPreference != null) {
updateState(mSwitchPreference);
if (mPreference != null) {
updateState(mPreference);
}
}
};

View File

@@ -25,9 +25,13 @@ import android.os.Handler;
import android.os.Looper;
import android.provider.Settings;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.widget.SettingsMainSwitchPreferenceController;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.dream.DreamBackend;
@@ -35,7 +39,7 @@ import com.android.settingslib.dream.DreamBackend;
* Preference controller for switching dreams on/off.
*/
public class DreamMainSwitchPreferenceController extends
SettingsMainSwitchPreferenceController implements LifecycleObserver {
TogglePreferenceController implements LifecycleObserver {
static final String MAIN_SWITCH_PREF_KEY = "dream_main_settings_switch";
private final DreamBackend mBackend;
@@ -43,15 +47,25 @@ public class DreamMainSwitchPreferenceController extends
new Handler(Looper.getMainLooper())) {
@Override
public void onChange(boolean selfChange) {
updateState(mSwitchPreference);
if (mPreference != null) {
updateState(mPreference);
}
}
};
private @Nullable Preference mPreference;
public DreamMainSwitchPreferenceController(Context context, String key) {
super(context, key);
mBackend = DreamBackend.getInstance(context);
}
@Override
public void displayPreference(@NonNull PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = screen.findPreference(getPreferenceKey());
}
@Override
public int getAvailabilityStatus() {
return AVAILABLE;

View File

@@ -22,7 +22,7 @@ import android.net.Uri;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.widget.SettingsMainSwitchPreferenceController;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -32,7 +32,7 @@ import com.android.settingslib.widget.MainSwitchPreference;
* The controller to handle one-handed mode main switch enable or disable state.
**/
public class OneHandedMainSwitchPreferenceController extends
SettingsMainSwitchPreferenceController implements OneHandedSettingsUtils.TogglesCallback,
TogglePreferenceController implements OneHandedSettingsUtils.TogglesCallback,
LifecycleObserver, OnStart, OnStop {
private final OneHandedSettingsUtils mUtils;

View File

@@ -28,7 +28,10 @@ import com.android.settingslib.widget.MainSwitchPreference;
/**
* Preference controller for MainSwitchPreference.
*
* @deprecated Use {@link TogglePreferenceController} directly
*/
@Deprecated
public abstract class SettingsMainSwitchPreferenceController extends
TogglePreferenceController implements OnCheckedChangeListener {