From 4fbf04cd1056928d1f2ef3c648b11112f80915de Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Thu, 1 Mar 2018 10:33:14 -0800 Subject: 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 --- .../AppsNotRespondingPreferenceController.java | 26 +++++----------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'src/com/android/settings/development/AppsNotRespondingPreferenceController.java') diff --git a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java index 98d7fa510c..6d43eee6e3 100644 --- a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java +++ b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java @@ -20,14 +20,12 @@ import android.provider.Settings; 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 AppsNotRespondingPreferenceController extends - DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, - PreferenceControllerMixin { +public class AppsNotRespondingPreferenceController extends DeveloperOptionsPreferenceController + implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs"; @@ -36,8 +34,6 @@ public class AppsNotRespondingPreferenceController extends @VisibleForTesting static final int SETTING_VALUE_OFF = 0; - private SwitchPreference mPreference; - public AppsNotRespondingPreferenceController(Context context) { super(context); } @@ -47,13 +43,6 @@ public class AppsNotRespondingPreferenceController extends return SHOW_ALL_ANRS_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; @@ -67,19 +56,14 @@ public class AppsNotRespondingPreferenceController extends public void updateState(Preference preference) { final int mode = Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, SETTING_VALUE_OFF); - mPreference.setChecked(mode != SETTING_VALUE_OFF); - } - - @Override - protected void onDeveloperOptionsSwitchEnabled() { - mPreference.setEnabled(true); + ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF); } @Override protected void onDeveloperOptionsSwitchDisabled() { + super.onDeveloperOptionsSwitchDisabled(); Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, SETTING_VALUE_OFF); - mPreference.setEnabled(false); - mPreference.setChecked(false); + ((SwitchPreference) mPreference).setChecked(false); } } -- cgit v1.2.3