Merge "Rename RadioButtonPreference -> SelectorWithWidgetPreference."

This commit is contained in:
Julia Reynolds
2021-08-05 20:34:13 +00:00
committed by Android (Google) Code Review
65 changed files with 311 additions and 305 deletions

View File

@@ -48,7 +48,7 @@ import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.widget.IllustrationPreference;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
import java.util.ArrayList;
import java.util.List;
@@ -109,8 +109,8 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
return;
}
for (CandidateInfo info : candidateList) {
RadioButtonPreference pref =
new RadioButtonPreference(getPrefContext());
SelectorWithWidgetPreference pref =
new SelectorWithWidgetPreference(getPrefContext());
bindPreference(pref, info.getKey(), info, defaultKey);
bindPreferenceExtra(pref, info.getKey(), info, defaultKey, systemDefaultKey);
screen.addPreference(pref);
@@ -119,7 +119,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
}
@Override
public void bindPreferenceExtra(RadioButtonPreference pref,
public void bindPreferenceExtra(SelectorWithWidgetPreference pref,
String key, CandidateInfo info, String defaultKey, String systemDefaultKey) {
if (!(info instanceof CandidateInfoExtra)) {
return;