Rename RadioButtonPreference -> SelectorWithWidgetPreference.

This change is to reduce ambiguity as we're adding the option to style the preference like a checkbox as well.

Bug: 190180868
Test: SelectorWithWidgetPreferenceTest, RunSettingsLibRoboTests
Change-Id: Ie414347bf67ed394ef495604890c5851fc42dbc7
This commit is contained in:
Yuri Lin
2021-07-20 11:42:39 -04:00
parent a113fdb727
commit e9f13fbd5e
65 changed files with 311 additions and 305 deletions

View File

@@ -53,7 +53,7 @@ import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.utils.StringUtil;
import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.LayoutPreference;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
import java.util.ArrayList;
import java.util.List;
@@ -66,7 +66,8 @@ import java.util.List;
*/
public class AdvancedPowerUsageDetail extends DashboardFragment implements
ButtonActionDialogFragment.AppButtonsDialogListener,
BatteryTipPreferenceController.BatteryTipListener, RadioButtonPreference.OnClickListener {
BatteryTipPreferenceController.BatteryTipListener,
SelectorWithWidgetPreference.OnClickListener {
public static final String TAG = "AdvancedPowerDetail";
public static final String EXTRA_UID = "extra_uid";
@@ -107,11 +108,11 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
@VisibleForTesting
FooterPreference mFooterPreference;
@VisibleForTesting
RadioButtonPreference mRestrictedPreference;
SelectorWithWidgetPreference mRestrictedPreference;
@VisibleForTesting
RadioButtonPreference mOptimizePreference;
SelectorWithWidgetPreference mOptimizePreference;
@VisibleForTesting
RadioButtonPreference mUnrestrictedPreference;
SelectorWithWidgetPreference mUnrestrictedPreference;
@VisibleForTesting
boolean enableTriState = true;
@@ -385,8 +386,8 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
final String packageName = bundle.getString(EXTRA_PACKAGE_NAME);
mAppButtonsPreferenceController = new AppButtonsPreferenceController(
(SettingsActivity) getActivity(), this, getSettingsLifecycle(), packageName,
mState, REQUEST_UNINSTALL, REQUEST_REMOVE_DEVICE_ADMIN);
(SettingsActivity) getActivity(), this, getSettingsLifecycle(),
packageName, mState, REQUEST_UNINSTALL, REQUEST_REMOVE_DEVICE_ADMIN);
controllers.add(mAppButtonsPreferenceController);
if (enableTriState) {
controllers.add(new UnrestrictedPreferenceController(context, uid, packageName));
@@ -425,7 +426,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
}
@Override
public void onRadioButtonClicked(RadioButtonPreference selected) {
public void onRadioButtonClicked(SelectorWithWidgetPreference selected) {
final String selectedKey = selected.getKey();
updatePreferenceState(mUnrestrictedPreference, selectedKey);
updatePreferenceState(mOptimizePreference, selectedKey);
@@ -452,7 +453,8 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
}
}
private void updatePreferenceState(RadioButtonPreference preference, String selectedKey) {
private void updatePreferenceState(SelectorWithWidgetPreference preference,
String selectedKey) {
preference.setChecked(selectedKey.equals(preference.getKey()));
}