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

Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591

Change-Id: Ib37a1f8280a7cef805545b88f09ea85fde83a076
This commit is contained in:
Abel Tesfaye
2021-06-16 17:39:45 +00:00
committed by Automerger Merge Worker
parent 6cb273d8c6 b8c610b188
commit 02c941968f
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,6 +90,7 @@ public class AdaptiveSleepPreferenceController {
if (enforcedAdmin != null) { if (enforcedAdmin != null) {
mPreference.setDisabledByAdmin(enforcedAdmin); mPreference.setDisabledByAdmin(enforcedAdmin);
} else { } else {
mPreference.setChecked(isChecked());
mPreference.setEnabled(hasSufficientPermission(mPackageManager) && !isCameraLocked() mPreference.setEnabled(hasSufficientPermission(mPackageManager) && !isCameraLocked()
&& !isPowerSaveMode()); && !isPowerSaveMode());
} }

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

@@ -81,6 +81,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
mAdaptiveSleepBatterySaverPreferenceController.updateVisibility(); mAdaptiveSleepBatterySaverPreferenceController.updateVisibility();
mAdaptiveSleepController.updatePreference();
} }
}; };