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

15
src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java
View File

@@ -35,10 +35,10 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
public class PreventRingingGesturePreferenceController extends AbstractPreferenceController
implements RadioButtonPreference.OnClickListener, LifecycleObserver,
implements SelectorWithWidgetPreference.OnClickListener, LifecycleObserver,
OnResume, OnPause, PreferenceControllerMixin {
@VisibleForTesting
@@ -54,9 +54,9 @@ public class PreventRingingGesturePreferenceController extends AbstractPreferenc
@VisibleForTesting
PreferenceCategory mPreferenceCategory;
@VisibleForTesting
RadioButtonPreference mVibratePref;
SelectorWithWidgetPreference mVibratePref;
@VisibleForTesting
RadioButtonPreference mMutePref;
SelectorWithWidgetPreference mMutePref;
private SettingObserver mSettingObserver;
@@ -100,7 +100,7 @@ public class PreventRingingGesturePreferenceController extends AbstractPreferenc
}
@Override
public void onRadioButtonClicked(RadioButtonPreference preference) {
public void onRadioButtonClicked(SelectorWithWidgetPreference preference) {
int preventRingingSetting = keyToSetting(preference.getKey());
if (preventRingingSetting != Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_VIBRATE)) {
@@ -157,8 +157,9 @@ public class PreventRingingGesturePreferenceController extends AbstractPreferenc
}
}
private RadioButtonPreference makeRadioPreference(String key, int titleId) {
RadioButtonPreference pref = new RadioButtonPreference(mPreferenceCategory.getContext());
private SelectorWithWidgetPreference makeRadioPreference(String key, int titleId) {
SelectorWithWidgetPreference pref = new SelectorWithWidgetPreference(
mPreferenceCategory.getContext());
pref.setKey(key);
pref.setTitle(titleId);
pref.setOnClickListener(this);