Remove unnecessary onDeveloperOptionsSwitchEnabled/Disabled override.
- default implementation has been added in the super class to handle enabling/disabling the preference when the master developer options switch it turned on/off. Removing all subclass that originally implemented the methods that only contains the default behavior. Bug: 73955632 Test: make RunSettingsRoboTests Change-Id: I13c372c2ab498a5786b40cdc1ad3b5f3424abb5a
This commit is contained in:
@@ -21,14 +21,12 @@ import android.net.wifi.WifiManager;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
import android.support.v14.preference.SwitchPreference;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
||||
|
||||
public class WifiVerboseLoggingPreferenceController extends
|
||||
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
|
||||
PreferenceControllerMixin {
|
||||
public class WifiVerboseLoggingPreferenceController extends DeveloperOptionsPreferenceController
|
||||
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
|
||||
|
||||
private static final String WIFI_VERBOSE_LOGGING_KEY = "wifi_verbose_logging";
|
||||
|
||||
@@ -38,7 +36,6 @@ public class WifiVerboseLoggingPreferenceController extends
|
||||
static final int SETTING_VALUE_OFF = 0;
|
||||
|
||||
private final WifiManager mWifiManager;
|
||||
private SwitchPreference mPreference;
|
||||
|
||||
public WifiVerboseLoggingPreferenceController(Context context) {
|
||||
super(context);
|
||||
@@ -51,13 +48,6 @@ public class WifiVerboseLoggingPreferenceController extends
|
||||
return WIFI_VERBOSE_LOGGING_KEY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
|
||||
mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
final boolean isEnabled = (Boolean) newValue;
|
||||
@@ -68,19 +58,14 @@ public class WifiVerboseLoggingPreferenceController extends
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
final boolean enabled = mWifiManager.getVerboseLoggingLevel() > 0;
|
||||
mPreference.setChecked(enabled);
|
||||
((SwitchPreference) mPreference).setChecked(enabled);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onDeveloperOptionsSwitchEnabled() {
|
||||
mPreference.setEnabled(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onDeveloperOptionsSwitchDisabled() {
|
||||
super.onDeveloperOptionsSwitchDisabled();
|
||||
mWifiManager.enableVerboseLogging(SETTING_VALUE_OFF);
|
||||
mPreference.setEnabled(false);
|
||||
mPreference.setChecked(false);
|
||||
((SwitchPreference) mPreference).setChecked(false);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user