Merge "Remove redundent @VisibleForTesting annotation"

This commit is contained in:
TreeHugger Robot
2019-11-19 04:03:29 +00:00
committed by Android (Google) Code Review

View File

@@ -150,12 +150,10 @@ public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFr
/** /**
* A chance for subclasses to bind additional things to the preference. * A chance for subclasses to bind additional things to the preference.
*/ */
@VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
public void bindPreferenceExtra(RadioButtonPreference pref, public void bindPreferenceExtra(RadioButtonPreference pref,
String key, CandidateInfo info, String defaultKey, String systemDefaultKey) { String key, CandidateInfo info, String defaultKey, String systemDefaultKey) {
} }
@VisibleForTesting
public void updateCandidates() { public void updateCandidates() {
mCandidates.clear(); mCandidates.clear();
final List<? extends CandidateInfo> candidateList = getCandidates(); final List<? extends CandidateInfo> candidateList = getCandidates();
@@ -204,7 +202,6 @@ public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFr
} }
} }
@VisibleForTesting
public RadioButtonPreference bindPreference(RadioButtonPreference pref, public RadioButtonPreference bindPreference(RadioButtonPreference pref,
String key, CandidateInfo info, String defaultKey) { String key, CandidateInfo info, String defaultKey) {
pref.setTitle(info.loadLabel()); pref.setTitle(info.loadLabel());
@@ -218,7 +215,6 @@ public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFr
return pref; return pref;
} }
@VisibleForTesting
public void updateCheckedState(String selectedKey) { public void updateCheckedState(String selectedKey) {
final PreferenceScreen screen = getPreferenceScreen(); final PreferenceScreen screen = getPreferenceScreen();
if (screen != null) { if (screen != null) {
@@ -236,7 +232,6 @@ public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFr
} }
} }
@VisibleForTesting
public void mayCheckOnlyRadioButton() { public void mayCheckOnlyRadioButton() {
final PreferenceScreen screen = getPreferenceScreen(); final PreferenceScreen screen = getPreferenceScreen();
// If there is only 1 thing on screen, select it. // If there is only 1 thing on screen, select it.