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

10
src/com/android/settings/display/ScreenTimeoutSettings.java
View File

@@ -53,7 +53,7 @@ import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.search.SearchIndexableRaw;
import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.RadioButtonPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
import com.google.common.annotations.VisibleForTesting;
@@ -181,8 +181,8 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
}
for (CandidateInfo info : candidateList) {
RadioButtonPreference pref =
new RadioButtonPreference(getPrefContext());
SelectorWithWidgetPreference pref =
new SelectorWithWidgetPreference(getPrefContext());
bindPreference(pref, info.getKey(), info, defaultKey);
screen.addPreference(pref);
}
@@ -192,8 +192,8 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
if (!candidateList.isEmpty() && (selectedTimeout > maxTimeout)) {
// The selected time out value is longer than the max timeout allowed by the admin.
// Select the largest value from the list by default.
final RadioButtonPreference preferenceWithLargestTimeout =
(RadioButtonPreference) screen.getPreference(candidateList.size() - 1);
final SelectorWithWidgetPreference preferenceWithLargestTimeout =
(SelectorWithWidgetPreference) screen.getPreference(candidateList.size() - 1);
preferenceWithLargestTimeout.setChecked(true);
}