PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary onDeveloperOptionsSwitchEnabled/Disabled override.

Browse Source 
- 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:
Doris Ling
2018-03-01 10:33:14 -08:00
parent 46d6ecc2b1
commit 4fbf04cd10
131 changed files with 489 additions and 1699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/development/AnimatorDurationScalePreferenceController.java
View File

@@ -22,16 +22,14 @@ import android.os.ServiceManager;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.view.IWindowManager;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class AnimatorDurationScalePreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
public class AnimatorDurationScalePreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String ANIMATOR_DURATION_SCALE_KEY = "animator_duration_scale";
@@ -44,8 +42,6 @@ public class AnimatorDurationScalePreferenceController extends
private final String[] mListValues;
private final String[] mListSummaries;
private ListPreference mPreference;
public AnimatorDurationScalePreferenceController(Context context) {
super(context);
@@ -61,13 +57,6 @@ public class AnimatorDurationScalePreferenceController extends
return ANIMATOR_DURATION_SCALE_KEY;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
writeAnimationScaleOption(newValue);
@@ -79,15 +68,10 @@ public class AnimatorDurationScalePreferenceController extends
updateAnimationScaleValue();
}
@Override
protected void onDeveloperOptionsSwitchEnabled() {
mPreference.setEnabled(true);
}
@Override
protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();
writeAnimationScaleOption(null);
mPreference.setEnabled(false);
}
private void writeAnimationScaleOption(Object newValue) {
@@ -111,8 +95,9 @@ public class AnimatorDurationScalePreferenceController extends
break;
}
}
mPreference.setValue(mListValues[index]);
mPreference.setSummary(mListSummaries[index]);
final ListPreference listPreference = (ListPreference) mPreference;
listPreference.setValue(mListValues[index]);
listPreference.setSummary(mListSummaries[index]);
} catch (RemoteException e) {
// intentional no-op
}