diff options
author | Doris Ling <dling@google.com> | 2018-03-01 10:33:14 -0800 |
---|---|---|
committer | Doris Ling <dling@google.com> | 2018-03-01 13:58:29 -0800 |
commit | 4fbf04cd1056928d1f2ef3c648b11112f80915de (patch) | |
tree | c32fb672c94d1543bb888f4b4499d5f92f238d36 /src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java | |
parent | 46d6ecc2b186245785dfaa7936c0723b6ebb91a0 (diff) | |
download | packages_apps_Settings-4fbf04cd1056928d1f2ef3c648b11112f80915de.tar.gz packages_apps_Settings-4fbf04cd1056928d1f2ef3c648b11112f80915de.tar.bz2 packages_apps_Settings-4fbf04cd1056928d1f2ef3c648b11112f80915de.zip |
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
Diffstat (limited to 'src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java')
-rw-r--r-- | src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java index ad2b7eb5b7..701dfecdb1 100644 --- a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java +++ b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java @@ -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); @@ -52,13 +49,6 @@ public class WifiVerboseLoggingPreferenceController extends } @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; mWifiManager.enableVerboseLogging(isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF); @@ -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); } } |