PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename RadioButtonPreference -> SelectorWithWidgetPreference.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java
View File

@@ -35,7 +35,7 @@ import com.android.settings.core.SubSettingLauncher;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.ConversationListSettings;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
import java.util.ArrayList;
import java.util.HashMap;
@@ -58,7 +58,7 @@ public class ZenModePriorityConversationsPreferenceController
private int mNumImportantConversations = UNSET;
private int mNumConversations = UNSET;
private PreferenceCategory mPreferenceCategory;
private List<RadioButtonPreference> mRadioButtonPreferences = new ArrayList<>();
private List<SelectorWithWidgetPreference> mSelectorWithWidgetPreferences = new ArrayList<>();
private Context mPreferenceScreenContext;
public ZenModePriorityConversationsPreferenceController(Context context, String key,
@@ -101,7 +101,7 @@ public class ZenModePriorityConversationsPreferenceController
public void updateState(Preference preference) {
final int currSetting = mBackend.getPriorityConversationSenders();
for (RadioButtonPreference pref : mRadioButtonPreferences) {
for (SelectorWithWidgetPreference pref : mSelectorWithWidgetPreferences) {
pref.setChecked(keyToSetting(pref.getKey()) == currSetting);
pref.setSummary(getSummary(pref.getKey()));
}
@@ -181,9 +181,9 @@ public class ZenModePriorityConversationsPreferenceController
}.execute();
}
private RadioButtonPreference makeRadioPreference(String key, int titleId) {
final RadioButtonPreference pref =
new RadioButtonPreference(mPreferenceCategory.getContext());
private SelectorWithWidgetPreference makeRadioPreference(String key, int titleId) {
final SelectorWithWidgetPreference pref =
new SelectorWithWidgetPreference(mPreferenceCategory.getContext());
if (KEY_ALL.equals(key) || KEY_IMPORTANT.equals(key)) {
pref.setExtraWidgetOnClickListener(mConversationSettingsWidgetClickListener);
}
@@ -191,7 +191,7 @@ public class ZenModePriorityConversationsPreferenceController
pref.setTitle(titleId);
pref.setOnClickListener(mRadioButtonClickListener);
mPreferenceCategory.addPreference(pref);
mRadioButtonPreferences.add(pref);
mSelectorWithWidgetPreferences.add(pref);
return pref;
}
@@ -206,10 +206,10 @@ public class ZenModePriorityConversationsPreferenceController
}
};
private RadioButtonPreference.OnClickListener mRadioButtonClickListener =
new RadioButtonPreference.OnClickListener() {
private SelectorWithWidgetPreference.OnClickListener mRadioButtonClickListener =
new SelectorWithWidgetPreference.OnClickListener() {
@Override
public void onRadioButtonClicked(RadioButtonPreference preference) {
public void onRadioButtonClicked(SelectorWithWidgetPreference preference) {
int selectedConversationSetting = keyToSetting(preference.getKey());
if (selectedConversationSetting != mBackend.getPriorityConversationSenders()) {
mBackend.saveConversationSenders(selectedConversationSetting);

22
src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java
View File

@@ -33,7 +33,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
import java.util.ArrayList;
import java.util.List;
@@ -63,7 +63,7 @@ public class ZenModePrioritySendersPreferenceController
private final boolean mIsMessages; // if this is false, then this preference is for calls
private PreferenceCategory mPreferenceCategory;
private List<RadioButtonPreference> mRadioButtonPreferences = new ArrayList<>();
private List<SelectorWithWidgetPreference> mSelectorWithWidgetPreferences = new ArrayList<>();
public ZenModePrioritySendersPreferenceController(Context context, String key,
Lifecycle lifecycle, boolean isMessages) {
@@ -110,7 +110,7 @@ public class ZenModePrioritySendersPreferenceController
public void updateState(Preference preference) {
final int currSetting = getPrioritySenders();
for (RadioButtonPreference pref : mRadioButtonPreferences) {
for (SelectorWithWidgetPreference pref : mSelectorWithWidgetPreferences) {
pref.setChecked(keyToSetting(pref.getKey()) == currSetting);
}
}
@@ -122,7 +122,7 @@ public class ZenModePrioritySendersPreferenceController
}
private void updateSummaries() {
for (RadioButtonPreference pref : mRadioButtonPreferences) {
for (SelectorWithWidgetPreference pref : mSelectorWithWidgetPreferences) {
pref.setSummary(getSummary(pref.getKey()));
}
}
@@ -165,9 +165,9 @@ public class ZenModePrioritySendersPreferenceController
}
}
private RadioButtonPreference makeRadioPreference(String key, int titleId) {
final RadioButtonPreference pref =
new RadioButtonPreference(mPreferenceCategory.getContext());
private SelectorWithWidgetPreference makeRadioPreference(String key, int titleId) {
final SelectorWithWidgetPreference pref =
new SelectorWithWidgetPreference(mPreferenceCategory.getContext());
pref.setKey(key);
pref.setTitle(titleId);
pref.setOnClickListener(mRadioButtonClickListener);
@@ -178,14 +178,14 @@ public class ZenModePrioritySendersPreferenceController
}
mPreferenceCategory.addPreference(pref);
mRadioButtonPreferences.add(pref);
mSelectorWithWidgetPreferences.add(pref);
return pref;
}
private RadioButtonPreference.OnClickListener mRadioButtonClickListener =
new RadioButtonPreference.OnClickListener() {
private SelectorWithWidgetPreference.OnClickListener mRadioButtonClickListener =
new SelectorWithWidgetPreference.OnClickListener() {
@Override
public void onRadioButtonClicked(RadioButtonPreference preference) {
public void onRadioButtonClicked(SelectorWithWidgetPreference preference) {
int selectedSetting = keyToSetting(preference.getKey());
if (selectedSetting != getPrioritySenders()) {
mBackend.saveSenders(

8
src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceController.java
View File

@@ -24,13 +24,13 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
public class ZenModeVisEffectsAllPreferenceController
extends AbstractZenModePreferenceController
implements RadioButtonPreference.OnClickListener {
implements SelectorWithWidgetPreference.OnClickListener {
private RadioButtonPreference mPreference;
private SelectorWithWidgetPreference mPreference;
protected static final int EFFECTS = Policy.SUPPRESSED_EFFECT_SCREEN_OFF
| Policy.SUPPRESSED_EFFECT_SCREEN_ON
@@ -69,7 +69,7 @@ public class ZenModeVisEffectsAllPreferenceController
}
@Override
public void onRadioButtonClicked(RadioButtonPreference p) {
public void onRadioButtonClicked(SelectorWithWidgetPreference p) {
mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_ZEN_SOUND_AND_VIS_EFFECTS, true);
mBackend.saveVisualEffectsPolicy(EFFECTS, true);

4
src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java
View File

@@ -26,12 +26,12 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
public class ZenModeVisEffectsCustomPreferenceController
extends AbstractZenModePreferenceController {
private RadioButtonPreference mPreference;
private SelectorWithWidgetPreference mPreference;
protected static final int INTERRUPTIVE_EFFECTS =
NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT

8
src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceController.java
View File

@@ -24,13 +24,13 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
public class ZenModeVisEffectsNonePreferenceController
extends AbstractZenModePreferenceController
implements RadioButtonPreference.OnClickListener {
implements SelectorWithWidgetPreference.OnClickListener {
private RadioButtonPreference mPreference;
private SelectorWithWidgetPreference mPreference;
protected static final int EFFECTS = Policy.SUPPRESSED_EFFECT_SCREEN_OFF
| Policy.SUPPRESSED_EFFECT_SCREEN_ON
@@ -68,7 +68,7 @@ public class ZenModeVisEffectsNonePreferenceController
}
@Override
public void onRadioButtonClicked(RadioButtonPreference preference) {
public void onRadioButtonClicked(SelectorWithWidgetPreference preference) {
mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_ZEN_SOUND_ONLY, true);
mBackend.saveVisualEffectsPolicy(EFFECTS, false);

4
src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceController.java
View File

@@ -25,12 +25,12 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
public class ZenRuleCustomPolicyPreferenceController extends
AbstractZenCustomRulePreferenceController {
private RadioButtonPreference mPreference;
private SelectorWithWidgetPreference mPreference;
public ZenRuleCustomPolicyPreferenceController(Context context, Lifecycle lifecycle,
String key) {

4
src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceController.java
View File

@@ -26,12 +26,12 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
public class ZenRuleDefaultPolicyPreferenceController extends
AbstractZenCustomRulePreferenceController implements PreferenceControllerMixin {
private RadioButtonPreference mPreference;
private SelectorWithWidgetPreference mPreference;
public ZenRuleDefaultPolicyPreferenceController(Context context, Lifecycle lifecycle,
String key) {

4
src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceController.java
View File

@@ -27,12 +27,12 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
public class ZenRuleVisEffectsAllPreferenceController extends
AbstractZenCustomRulePreferenceController implements PreferenceControllerMixin {
private RadioButtonPreference mPreference;
private SelectorWithWidgetPreference mPreference;
public ZenRuleVisEffectsAllPreferenceController(Context context, Lifecycle lifecycle,
String key) {

4
src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceController.java
View File

@@ -27,12 +27,12 @@ import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
public class ZenRuleVisEffectsCustomPreferenceController extends
AbstractZenCustomRulePreferenceController implements PreferenceControllerMixin {
private RadioButtonPreference mPreference;
private SelectorWithWidgetPreference mPreference;
public ZenRuleVisEffectsCustomPreferenceController(Context context, Lifecycle lifecycle,
String key) {

4
src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceController.java
View File

@@ -27,12 +27,12 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
public class ZenRuleVisEffectsNonePreferenceController extends
AbstractZenCustomRulePreferenceController implements PreferenceControllerMixin {
private RadioButtonPreference mPreference;
private SelectorWithWidgetPreference mPreference;
public ZenRuleVisEffectsNonePreferenceController(Context context, Lifecycle lifecycle,
String key) {