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

Merge "Replace some customized RadioButtonPreferences"

Browse Source
This commit is contained in:
Edgar Wang
2021-01-06 16:31:02 +00:00
committed by Android (Google) Code Review
parent bed8dee669 c0e7328a88
commit e49ae19b1e
27 changed files with 123 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,13 +37,13 @@ import com.android.settings.search.actionbar.SearchMenuController;
import com.android.settings.support.actionbar.HelpMenuController;
import com.android.settings.support.actionbar.HelpResourceProvider;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settings.widget.RadioButtonPreferenceWithExtraWidget;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
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.google.common.annotations.VisibleForTesting;
@@ -152,8 +152,8 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
}
for (CandidateInfo info : candidateList) {
RadioButtonPreferenceWithExtraWidget pref =
new RadioButtonPreferenceWithExtraWidget(getPrefContext());
RadioButtonPreference pref =
new RadioButtonPreference(getPrefContext());
bindPreference(pref, info.getKey(), info, defaultKey);
screen.addPreference(pref);
}