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

34
src/com/android/settings/development/HdcpCheckingPreferenceController.java
View File

@@ -22,7 +22,6 @@ import android.os.SystemProperties;
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.text.TextUtils;
import com.android.settings.R;
@@ -30,9 +29,8 @@ import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
public class HdcpCheckingPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
public class HdcpCheckingPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String HDCP_CHECKING_KEY = "hdcp_checking";
@@ -43,7 +41,6 @@ public class HdcpCheckingPreferenceController extends
private final String[] mListValues;
private final String[] mListSummaries;
private ListPreference mPreference;
public HdcpCheckingPreferenceController(Context context) {
super(context);
@@ -62,37 +59,20 @@ public class HdcpCheckingPreferenceController extends
return HDCP_CHECKING_KEY;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
SystemProperties.set(HDCP_CHECKING_PROPERTY, newValue.toString());
updateHdcpValues();
updateHdcpValues((ListPreference) mPreference);
SystemPropPoker.getInstance().poke();
return true;
}
@Override
public void updateState(Preference preference) {
updateHdcpValues();
updateHdcpValues((ListPreference) mPreference);
}
@Override
protected void onDeveloperOptionsSwitchEnabled() {
mPreference.setEnabled(true);
}
@Override
protected void onDeveloperOptionsSwitchDisabled() {
mPreference.setEnabled(false);
}
private void updateHdcpValues() {
private void updateHdcpValues(ListPreference preference) {
final String currentValue = SystemProperties.get(HDCP_CHECKING_PROPERTY);
int index = 1; // Defaults to drm-only. Needs to match with R.array.hdcp_checking_values
for (int i = 0; i < mListValues.length; i++) {
@@ -101,8 +81,8 @@ public class HdcpCheckingPreferenceController extends
break;
}
}
mPreference.setValue(mListValues[index]);
mPreference.setSummary(mListSummaries[index]);
preference.setValue(mListValues[index]);
preference.setSummary(mListSummaries[index]);
}
@VisibleForTesting