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

Merge "Fixes NPE in Screen attention setting" into sc-dev

Browse Source
This commit is contained in:
Yi Jiang
2021-05-06 06:55:33 +00:00
committed by Android (Google) Code Review
parent b720318fd3 f54a2be819
commit d0af03e11c
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/display/AdaptiveSleepPreferenceController.java
View File

@@ -73,7 +73,6 @@ public class AdaptiveSleepPreferenceController {
* Adds the controlled preference to the provided preference screen. * Adds the controlled preference to the provided preference screen.
*/ */
public void addToScreen(PreferenceScreen screen) { public void addToScreen(PreferenceScreen screen) {
initializePreference();
updatePreference(); updatePreference();
screen.addPreference(mPreference); screen.addPreference(mPreference);
} }
@@ -82,6 +81,7 @@ public class AdaptiveSleepPreferenceController {
* Updates the appearance of the preference. * Updates the appearance of the preference.
*/ */
public void updatePreference() { public void updatePreference() {
initializePreference();
final EnforcedAdmin enforcedAdmin = mRestrictionUtils.checkIfRestrictionEnforced(mContext, final EnforcedAdmin enforcedAdmin = mRestrictionUtils.checkIfRestrictionEnforced(mContext,
UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT); UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT);
if (enforcedAdmin != null) { if (enforcedAdmin != null) {
@@ -93,6 +93,7 @@ public class AdaptiveSleepPreferenceController {
@VisibleForTesting @VisibleForTesting
void initializePreference() { void initializePreference() {
if (mPreference == null) {
mPreference = new RestrictedSwitchPreference(mContext); mPreference = new RestrictedSwitchPreference(mContext);
mPreference.setTitle(R.string.adaptive_sleep_title); mPreference.setTitle(R.string.adaptive_sleep_title);
mPreference.setSummary(R.string.adaptive_sleep_description); mPreference.setSummary(R.string.adaptive_sleep_description);
@@ -100,13 +101,15 @@ public class AdaptiveSleepPreferenceController {
mPreference.setKey(PREFERENCE_KEY); mPreference.setKey(PREFERENCE_KEY);
mPreference.setOnPreferenceChangeListener((preference, value) -> { mPreference.setOnPreferenceChangeListener((preference, value) -> {
final boolean isChecked = (Boolean) value; final boolean isChecked = (Boolean) value;
mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_SCREEN_ATTENTION_CHANGED, mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_SCREEN_ATTENTION_CHANGED,
isChecked); isChecked);
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ADAPTIVE_SLEEP, isChecked ? 1 : DEFAULT_VALUE); Settings.Secure.ADAPTIVE_SLEEP, isChecked ? 1 : DEFAULT_VALUE);
return true; return true;
}); });
} }
}
@VisibleForTesting @VisibleForTesting
boolean isChecked() { boolean isChecked() {