Merge "Rename RadioButtonPreference -> SelectorWithWidgetPreference."
This commit is contained in:
committed by
Android (Google) Code Review
commit
17dda0faec
@@ -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;
|
||||
|
Reference in New Issue
Block a user