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

Refactor duplicate isAdaptiveSleepSupported

Browse Source 
Bug: 368359967
Flag: EXEMPT refactor
Test: atest
Change-Id: I41d465f67fb50e83d9bd23af54597afb6bd467cf
This commit is contained in:
Jacky Wang
2024-11-15 16:06:27 +08:00
parent a3cdf47415
commit 8d3be11418
3 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,8 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.OTHER_OPT
import static android.hardware.SensorPrivacyManager.Sensors.CAMERA;
import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
import static com.android.settings.display.UtilsKt.isAdaptiveSleepSupported;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
@@ -222,7 +224,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment
FeatureFactory.getFeatureFactory().getDisplayFeatureProvider()
.addToScreen(mAdditionalTogglePreferenceController, screen);
if (isScreenAttentionAvailable(getContext())) {
if (isAdaptiveSleepSupported(getContext())) {
mAdaptiveSleepPermissionController.addToScreen(screen);
mAdaptiveSleepCameraStatePreferenceController.addToScreen(screen);
mAdaptiveSleepController.addToScreen(screen);
@@ -352,10 +354,6 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment
}
}
private static boolean isScreenAttentionAvailable(Context context) {
return AdaptiveSleepPreferenceController.isAdaptiveSleepSupported(context);
}
private static long getTimeoutFromKey(String key) {
return Long.parseLong(key);
}
@@ -423,7 +421,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment
new BaseSearchIndexProvider(R.xml.screen_timeout_settings) {
public List<SearchIndexableRaw> getRawDataToIndex(
Context context, boolean enabled) {
if (!isScreenAttentionAvailable(context)) {
if (!isAdaptiveSleepSupported(context)) {
return null;
}
final Resources res = context.getResources();