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

Add master toggle to enable/disable screen savers

Browse Source 
The new control toggles the Settings.Secure.SCREENSAVER_ENABLED setting,
which controls if a screen saver is enabled. Also removed the "Never"
option from the WhenToDream picker, since this is now controlled via the
toggle.

Test: locally on device
Bug: 222360260
Change-Id: Ibcf52b5e2d1ad0c295f32c4c18bfc89082d074ce
This commit is contained in:
Lucas Silva
2022-03-03 17:39:50 -05:00
parent 3ccdcd433a
commit d9071dea25
11 changed files with 393 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/android/settings/dream/DreamPickerController.java
View File

@@ -16,11 +16,15 @@
package com.android.settings.dream;
import static com.android.settings.dream.DreamMainSwitchPreferenceController.MAIN_SWITCH_PREF_KEY;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.widget.Switch;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.recyclerview.widget.RecyclerView;
@@ -31,6 +35,8 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.dream.DreamBackend;
import com.android.settingslib.dream.DreamBackend.DreamInfo;
import com.android.settingslib.widget.LayoutPreference;
import com.android.settingslib.widget.MainSwitchPreference;
import com.android.settingslib.widget.OnMainSwitchChangeListener;
import java.util.List;
import java.util.stream.Collectors;
@@ -38,8 +44,8 @@ import java.util.stream.Collectors;
/**
* Controller for the dream picker where the user can select a screensaver.
*/
public class DreamPickerController extends BasePreferenceController {
private static final String KEY = "dream_picker";
public class DreamPickerController extends BasePreferenceController implements
OnMainSwitchChangeListener {
private final DreamBackend mBackend;
private final MetricsFeatureProvider mMetricsFeatureProvider;
@@ -48,23 +54,18 @@ public class DreamPickerController extends BasePreferenceController {
private DreamInfo mActiveDream;
private DreamAdapter mAdapter;
public DreamPickerController(Context context) {
this(context, DreamBackend.getInstance(context));
public DreamPickerController(Context context, String key) {
this(context, key, DreamBackend.getInstance(context));
}
public DreamPickerController(Context context, DreamBackend backend) {
super(context, KEY);
public DreamPickerController(Context context, String key, DreamBackend backend) {
super(context, key);
mBackend = backend;
mDreamInfos = mBackend.getDreamInfos();
mActiveDream = getActiveDreamInfo(mDreamInfos);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
}
@Override
public String getPreferenceKey() {
return KEY;
}
@Override
public int getAvailabilityStatus() {
return mDreamInfos.size() > 0 ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
@@ -79,6 +80,8 @@ public class DreamPickerController extends BasePreferenceController {
.map(DreamItem::new)
.collect(Collectors.toList()));
mAdapter.setEnabled(mBackend.isEnabled());
final LayoutPreference pref = screen.findPreference(getPreferenceKey());
if (pref == null) {
return;
@@ -89,6 +92,11 @@ public class DreamPickerController extends BasePreferenceController {
new GridSpacingItemDecoration(mContext, R.dimen.dream_preference_card_padding));
recyclerView.setHasFixedSize(true);
recyclerView.setAdapter(mAdapter);
final Preference mainSwitchPref = screen.findPreference(MAIN_SWITCH_PREF_KEY);
if (mainSwitchPref instanceof MainSwitchPreference) {
((MainSwitchPreference) mainSwitchPref).addOnSwitchChangeListener(this);
}
}
@Nullable
@@ -100,6 +108,13 @@ public class DreamPickerController extends BasePreferenceController {
.orElse(null);
}
@Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
if (mAdapter != null) {
mAdapter.setEnabled(isChecked);
}
}
private class DreamItem implements IDreamItem {
DreamInfo mDreamInfo;