Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename RadioButtonPreference -> SelectorWithWidgetPreference."

Browse Source
This commit is contained in:
Julia Reynolds
2021-08-05 20:34:13 +00:00
committed by Android (Google) Code Review
parent e3e33471a9 e9f13fbd5e
commit 17dda0faec
65 changed files with 311 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/applications/OpenSupportedLinks.java
View File

@@ -34,13 +34,13 @@ import androidx.preference.PreferenceCategory;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
/**
* Display the Open Supported Links page. Allow users choose what kind supported links they need.
*/
public class OpenSupportedLinks extends AppInfoWithHeader implements
RadioButtonPreference.OnClickListener {
SelectorWithWidgetPreference.OnClickListener {
private static final String TAG = "OpenSupportedLinks";
private static final String RADIO_GROUP_KEY = "supported_links_radio_group";
private static final String FOOTER_KEY = "supported_links_footer";
@@ -60,11 +60,11 @@ public class OpenSupportedLinks extends AppInfoWithHeader implements
@VisibleForTesting
PreferenceCategory mPreferenceCategory;
@VisibleForTesting
RadioButtonPreference mAllowOpening;
SelectorWithWidgetPreference mAllowOpening;
@VisibleForTesting
RadioButtonPreference mAskEveryTime;
SelectorWithWidgetPreference mAskEveryTime;
@VisibleForTesting
RadioButtonPreference mNotAllowed;
SelectorWithWidgetPreference mNotAllowed;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -101,7 +101,7 @@ public class OpenSupportedLinks extends AppInfoWithHeader implements
}
@Override
public void onRadioButtonClicked(RadioButtonPreference preference) {
public void onRadioButtonClicked(SelectorWithWidgetPreference preference) {
final int clickedIndex = preferenceKeyToIndex(preference.getKey());
if (mCurrentIndex != clickedIndex) {
mCurrentIndex = clickedIndex;
@@ -110,8 +110,8 @@ public class OpenSupportedLinks extends AppInfoWithHeader implements
}
}
private RadioButtonPreference makeRadioPreference(String key, int stringId) {
final RadioButtonPreference pref = new RadioButtonPreference(
private SelectorWithWidgetPreference makeRadioPreference(String key, int stringId) {
final SelectorWithWidgetPreference pref = new SelectorWithWidgetPreference(
mPreferenceCategory.getContext());
pref.setKey(key);
pref.setTitle(stringId);

6
src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
View File

@@ -35,7 +35,7 @@ import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
/**
* A generic app picker fragment that shows a list of app as radio button group.
@@ -53,7 +53,7 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
}
@Override
public void onRadioButtonClicked(RadioButtonPreference selected) {
public void onRadioButtonClicked(SelectorWithWidgetPreference selected) {
final String selectedKey = selected.getKey();
final CharSequence confirmationMessage = getConfirmationMessage(getCandidate(selectedKey));
final FragmentActivity activity = getActivity();
@@ -78,7 +78,7 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
}
@Override
public void bindPreferenceExtra(RadioButtonPreference pref,
public void bindPreferenceExtra(SelectorWithWidgetPreference pref,
String key, CandidateInfo info, String defaultKey, String systemDefaultKey) {
if (!(info instanceof DefaultAppInfo)) {
return;