PawletOS/app_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

10
src/com/android/settings/gestures/OneHandedActionPullDownPrefController.java
View File

@@ -26,7 +26,7 @@ import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
/**
* The controller to handle one-handed mode pull screen into reach preference.
@@ -46,8 +46,8 @@ public class OneHandedActionPullDownPrefController extends BasePreferenceControl
@Override
public void updateState(Preference preference) {
super.updateState(preference);
if (preference instanceof RadioButtonPreference) {
((RadioButtonPreference) preference).setChecked(
if (preference instanceof SelectorWithWidgetPreference) {
((SelectorWithWidgetPreference) preference).setChecked(
!OneHandedSettingsUtils.isSwipeDownNotificationEnabled(mContext));
}
}
@@ -65,8 +65,8 @@ public class OneHandedActionPullDownPrefController extends BasePreferenceControl
return false;
}
OneHandedSettingsUtils.setSwipeDownNotificationEnabled(mContext, false);
if (preference instanceof RadioButtonPreference) {
((RadioButtonPreference) preference).setChecked(true);
if (preference instanceof SelectorWithWidgetPreference) {
((SelectorWithWidgetPreference) preference).setChecked(true);
}
return true;
}

10
src/com/android/settings/gestures/OneHandedActionShowNotificationPrefController.java
View File

@@ -26,7 +26,7 @@ import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
/**
* The controller to handle one-handed mode show notification preference.
@@ -46,8 +46,8 @@ public class OneHandedActionShowNotificationPrefController extends BasePreferenc
@Override
public void updateState(Preference preference) {
super.updateState(preference);
if (preference instanceof RadioButtonPreference) {
((RadioButtonPreference) preference).setChecked(
if (preference instanceof SelectorWithWidgetPreference) {
((SelectorWithWidgetPreference) preference).setChecked(
OneHandedSettingsUtils.isSwipeDownNotificationEnabled(mContext));
}
}
@@ -65,8 +65,8 @@ public class OneHandedActionShowNotificationPrefController extends BasePreferenc
return false;
}
OneHandedSettingsUtils.setSwipeDownNotificationEnabled(mContext, true);
if (preference instanceof RadioButtonPreference) {
((RadioButtonPreference) preference).setChecked(true);
if (preference instanceof SelectorWithWidgetPreference) {
((SelectorWithWidgetPreference) preference).setChecked(true);
}
return true;
}

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);

8
src/com/android/settings/gestures/SystemNavigationGestureSettings.java
View File

@@ -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;