Add master toggle to enable/disable screen savers
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:
@@ -17,6 +17,8 @@
|
|||||||
|
|
||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android"
|
<selector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
|
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
|
||||||
|
<item android:state_enabled="false" android:color="?androidprv:attr/colorSurface"
|
||||||
|
android:alpha="?android:attr/disabledAlpha"/>
|
||||||
<item android:state_selected="true" android:color="?androidprv:attr/colorAccentPrimary"/>
|
<item android:state_selected="true" android:color="?androidprv:attr/colorAccentPrimary"/>
|
||||||
<item android:color="?androidprv:attr/colorSurface"/>
|
<item android:color="?androidprv:attr/colorSurface"/>
|
||||||
</selector>
|
</selector>
|
@@ -17,6 +17,8 @@
|
|||||||
|
|
||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android"
|
<selector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
|
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
|
||||||
|
<item android:state_enabled="false" android:color="?android:attr/textColorPrimary"
|
||||||
|
android:alpha="?android:attr/disabledAlpha"/>
|
||||||
<item android:state_selected="true" android:color="?androidprv:attr/textColorOnAccent"/>
|
<item android:state_selected="true" android:color="?androidprv:attr/textColorOnAccent"/>
|
||||||
<item android:color="?android:attr/textColorPrimary"/>
|
<item android:color="?android:attr/textColorPrimary"/>
|
||||||
</selector>
|
</selector>
|
@@ -1220,14 +1220,12 @@
|
|||||||
<item>@string/screensaver_settings_summary_sleep</item>
|
<item>@string/screensaver_settings_summary_sleep</item>
|
||||||
<item>@string/screensaver_settings_summary_dock</item>
|
<item>@string/screensaver_settings_summary_dock</item>
|
||||||
<item>@string/screensaver_settings_summary_either_long</item>
|
<item>@string/screensaver_settings_summary_either_long</item>
|
||||||
<item>@string/screensaver_settings_summary_never</item>
|
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
<string-array name="when_to_start_screensaver_values" translatable="false">
|
<string-array name="when_to_start_screensaver_values" translatable="false">
|
||||||
<item>while_charging_only</item>
|
<item>while_charging_only</item>
|
||||||
<item>while_docked_only</item>
|
<item>while_docked_only</item>
|
||||||
<item>either_charging_or_docked</item>
|
<item>either_charging_or_docked</item>
|
||||||
<item>never</item>
|
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
<string-array name="zen_mode_contacts_messages_entries" translatable="false">
|
<string-array name="zen_mode_contacts_messages_entries" translatable="false">
|
||||||
|
@@ -3168,6 +3168,8 @@
|
|||||||
<string name="style_suggestion_summary">Try different styles, wallpapers, and more</string>
|
<string name="style_suggestion_summary">Try different styles, wallpapers, and more</string>
|
||||||
<!-- Display settings screen, trigger for screen saver options -->
|
<!-- Display settings screen, trigger for screen saver options -->
|
||||||
<string name="screensaver_settings_title">Screen saver</string>
|
<string name="screensaver_settings_title">Screen saver</string>
|
||||||
|
<!-- The title for the toggle which disables/enables screen savers [CHAR_LIMIT=30] -->
|
||||||
|
<string name="screensaver_settings_toggle_title">Use screen saver</string>
|
||||||
<!-- Display settings screen, summary fragment for screen saver options, activated when docked or asleep and charging -->
|
<!-- Display settings screen, summary fragment for screen saver options, activated when docked or asleep and charging -->
|
||||||
<string name="screensaver_settings_summary_either_long">While charging or docked</string>
|
<string name="screensaver_settings_summary_either_long">While charging or docked</string>
|
||||||
<!-- Dream settings screen, dialog option, activated when docked or asleep and charging -->
|
<!-- Dream settings screen, dialog option, activated when docked or asleep and charging -->
|
||||||
|
@@ -19,6 +19,14 @@
|
|||||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||||
android:title="@string/screensaver_settings_title">
|
android:title="@string/screensaver_settings_title">
|
||||||
|
|
||||||
|
<com.android.settingslib.widget.MainSwitchPreference
|
||||||
|
android:key="dream_main_settings_switch"
|
||||||
|
android:title="@string/screensaver_settings_toggle_title"
|
||||||
|
settings:controller="com.android.settings.dream.DreamMainSwitchPreferenceController"
|
||||||
|
settings:searchable="false"/>
|
||||||
|
|
||||||
|
<PreferenceCategory
|
||||||
|
android:key="dream_main_category">
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:title="@string/dream_picker_category">
|
android:title="@string/dream_picker_category">
|
||||||
<com.android.settingslib.widget.LayoutPreference
|
<com.android.settingslib.widget.LayoutPreference
|
||||||
@@ -40,5 +48,6 @@
|
|||||||
android:title="@string/screensaver_settings_when_to_dream"
|
android:title="@string/screensaver_settings_when_to_dream"
|
||||||
android:fragment="com.android.settings.dream.WhenToDreamPicker"/>
|
android:fragment="com.android.settings.dream.WhenToDreamPicker"/>
|
||||||
</PreferenceCategory>
|
</PreferenceCategory>
|
||||||
|
</PreferenceCategory>
|
||||||
|
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
||||||
|
@@ -32,6 +32,7 @@ import androidx.annotation.NonNull;
|
|||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
|
import com.android.settingslib.utils.ColorUtil;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -43,17 +44,20 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||||||
@LayoutRes
|
@LayoutRes
|
||||||
private final int mLayoutRes;
|
private final int mLayoutRes;
|
||||||
private int mLastSelectedPos = -1;
|
private int mLastSelectedPos = -1;
|
||||||
|
private boolean mEnabled = true;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* View holder for each {@link IDreamItem}.
|
* View holder for each {@link IDreamItem}.
|
||||||
*/
|
*/
|
||||||
private class DreamViewHolder extends RecyclerView.ViewHolder {
|
private class DreamViewHolder extends RecyclerView.ViewHolder {
|
||||||
|
private static final int VALUE_ENABLED_ALPHA = 255;
|
||||||
private final TextView mTitleView;
|
private final TextView mTitleView;
|
||||||
private final TextView mSummaryView;
|
private final TextView mSummaryView;
|
||||||
private final ImageView mPreviewView;
|
private final ImageView mPreviewView;
|
||||||
private final ImageView mPreviewPlaceholderView;
|
private final ImageView mPreviewPlaceholderView;
|
||||||
private final Button mCustomizeButton;
|
private final Button mCustomizeButton;
|
||||||
private final Context mContext;
|
private final Context mContext;
|
||||||
|
private final int mDisabledAlphaValue;
|
||||||
|
|
||||||
DreamViewHolder(View view, Context context) {
|
DreamViewHolder(View view, Context context) {
|
||||||
super(view);
|
super(view);
|
||||||
@@ -63,6 +67,7 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||||||
mTitleView = view.findViewById(R.id.title_text);
|
mTitleView = view.findViewById(R.id.title_text);
|
||||||
mSummaryView = view.findViewById(R.id.summary_text);
|
mSummaryView = view.findViewById(R.id.summary_text);
|
||||||
mCustomizeButton = view.findViewById(R.id.customize_button);
|
mCustomizeButton = view.findViewById(R.id.customize_button);
|
||||||
|
mDisabledAlphaValue = (int) (ColorUtil.getDisabledAlpha(context) * VALUE_ENABLED_ALPHA);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -88,10 +93,11 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||||||
mPreviewView.setImageDrawable(null);
|
mPreviewView.setImageDrawable(null);
|
||||||
mPreviewPlaceholderView.setVisibility(View.VISIBLE);
|
mPreviewPlaceholderView.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
mPreviewView.setImageAlpha(getAlpha());
|
||||||
|
|
||||||
final Drawable icon = item.isActive()
|
final Drawable icon = item.isActive()
|
||||||
? mContext.getDrawable(R.drawable.ic_dream_check_circle)
|
? mContext.getDrawable(R.drawable.ic_dream_check_circle)
|
||||||
: item.getIcon();
|
: item.getIcon().mutate();
|
||||||
if (icon instanceof VectorDrawable) {
|
if (icon instanceof VectorDrawable) {
|
||||||
icon.setTintList(
|
icon.setTintList(
|
||||||
mContext.getColorStateList(R.color.dream_card_icon_color_state_list));
|
mContext.getColorStateList(R.color.dream_card_icon_color_state_list));
|
||||||
@@ -99,6 +105,7 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||||||
final int iconSize = mContext.getResources().getDimensionPixelSize(
|
final int iconSize = mContext.getResources().getDimensionPixelSize(
|
||||||
R.dimen.dream_item_icon_size);
|
R.dimen.dream_item_icon_size);
|
||||||
icon.setBounds(0, 0, iconSize, iconSize);
|
icon.setBounds(0, 0, iconSize, iconSize);
|
||||||
|
icon.setAlpha(getAlpha());
|
||||||
mTitleView.setCompoundDrawablesRelative(icon, null, null, null);
|
mTitleView.setCompoundDrawablesRelative(icon, null, null, null);
|
||||||
|
|
||||||
if (item.isActive()) {
|
if (item.isActive()) {
|
||||||
@@ -109,7 +116,8 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||||||
}
|
}
|
||||||
|
|
||||||
mCustomizeButton.setOnClickListener(v -> item.onCustomizeClicked());
|
mCustomizeButton.setOnClickListener(v -> item.onCustomizeClicked());
|
||||||
mCustomizeButton.setVisibility(item.allowCustomization() ? View.VISIBLE : View.GONE);
|
mCustomizeButton.setVisibility(
|
||||||
|
item.allowCustomization() && mEnabled ? View.VISIBLE : View.GONE);
|
||||||
|
|
||||||
itemView.setOnClickListener(v -> {
|
itemView.setOnClickListener(v -> {
|
||||||
item.onItemClicked();
|
item.onItemClicked();
|
||||||
@@ -118,6 +126,26 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||||||
}
|
}
|
||||||
notifyItemChanged(position);
|
notifyItemChanged(position);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
setEnabledStateOnViews(itemView, mEnabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
private int getAlpha() {
|
||||||
|
return mEnabled ? VALUE_ENABLED_ALPHA : mDisabledAlphaValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Makes sure the view (and any children) get the enabled state changed.
|
||||||
|
*/
|
||||||
|
private void setEnabledStateOnViews(@NonNull View v, boolean enabled) {
|
||||||
|
v.setEnabled(enabled);
|
||||||
|
|
||||||
|
if (v instanceof ViewGroup) {
|
||||||
|
final ViewGroup vg = (ViewGroup) v;
|
||||||
|
for (int i = vg.getChildCount() - 1; i >= 0; i--) {
|
||||||
|
setEnabledStateOnViews(vg.getChildAt(i), enabled);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -143,4 +171,14 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||||||
public int getItemCount() {
|
public int getItemCount() {
|
||||||
return mItemList.size();
|
return mItemList.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the enabled state of all items.
|
||||||
|
*/
|
||||||
|
public void setEnabled(boolean enabled) {
|
||||||
|
if (mEnabled != enabled) {
|
||||||
|
mEnabled = enabled;
|
||||||
|
notifyDataSetChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,93 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2022 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.dream;
|
||||||
|
|
||||||
|
import static androidx.lifecycle.Lifecycle.Event.ON_START;
|
||||||
|
import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.database.ContentObserver;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.os.Looper;
|
||||||
|
import android.provider.Settings;
|
||||||
|
|
||||||
|
import androidx.lifecycle.OnLifecycleEvent;
|
||||||
|
|
||||||
|
import com.android.settings.widget.SettingsMainSwitchPreferenceController;
|
||||||
|
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||||
|
import com.android.settingslib.dream.DreamBackend;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Preference controller for switching dreams on/off.
|
||||||
|
*/
|
||||||
|
public class DreamMainSwitchPreferenceController extends
|
||||||
|
SettingsMainSwitchPreferenceController implements LifecycleObserver {
|
||||||
|
static final String MAIN_SWITCH_PREF_KEY = "dream_main_settings_switch";
|
||||||
|
private final DreamBackend mBackend;
|
||||||
|
|
||||||
|
private final ContentObserver mObserver = new ContentObserver(
|
||||||
|
new Handler(Looper.getMainLooper())) {
|
||||||
|
@Override
|
||||||
|
public void onChange(boolean selfChange) {
|
||||||
|
updateState(mSwitchPreference);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public DreamMainSwitchPreferenceController(Context context, String key) {
|
||||||
|
super(context, key);
|
||||||
|
mBackend = DreamBackend.getInstance(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getAvailabilityStatus() {
|
||||||
|
return AVAILABLE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isChecked() {
|
||||||
|
return mBackend.isEnabled();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean setChecked(boolean isChecked) {
|
||||||
|
mBackend.setEnabled(isChecked);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isSliceable() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getSliceHighlightMenuRes() {
|
||||||
|
// not needed since it's not sliceable
|
||||||
|
return NO_RES;
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnLifecycleEvent(ON_START)
|
||||||
|
void onStart() {
|
||||||
|
mContext.getContentResolver().registerContentObserver(
|
||||||
|
Settings.Secure.getUriFor(Settings.Secure.SCREENSAVER_ENABLED),
|
||||||
|
/* notifyForDescendants= */ false, mObserver);
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnLifecycleEvent(ON_STOP)
|
||||||
|
void onStop() {
|
||||||
|
mContext.getContentResolver().unregisterContentObserver(mObserver);
|
||||||
|
}
|
||||||
|
}
|
@@ -16,11 +16,15 @@
|
|||||||
|
|
||||||
package com.android.settings.dream;
|
package com.android.settings.dream;
|
||||||
|
|
||||||
|
import static com.android.settings.dream.DreamMainSwitchPreferenceController.MAIN_SWITCH_PREF_KEY;
|
||||||
|
|
||||||
import android.app.settings.SettingsEnums;
|
import android.app.settings.SettingsEnums;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.graphics.drawable.Drawable;
|
import android.graphics.drawable.Drawable;
|
||||||
|
import android.widget.Switch;
|
||||||
|
|
||||||
import androidx.annotation.Nullable;
|
import androidx.annotation.Nullable;
|
||||||
|
import androidx.preference.Preference;
|
||||||
import androidx.preference.PreferenceScreen;
|
import androidx.preference.PreferenceScreen;
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
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;
|
||||||
import com.android.settingslib.dream.DreamBackend.DreamInfo;
|
import com.android.settingslib.dream.DreamBackend.DreamInfo;
|
||||||
import com.android.settingslib.widget.LayoutPreference;
|
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.List;
|
||||||
import java.util.stream.Collectors;
|
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.
|
* Controller for the dream picker where the user can select a screensaver.
|
||||||
*/
|
*/
|
||||||
public class DreamPickerController extends BasePreferenceController {
|
public class DreamPickerController extends BasePreferenceController implements
|
||||||
private static final String KEY = "dream_picker";
|
OnMainSwitchChangeListener {
|
||||||
|
|
||||||
private final DreamBackend mBackend;
|
private final DreamBackend mBackend;
|
||||||
private final MetricsFeatureProvider mMetricsFeatureProvider;
|
private final MetricsFeatureProvider mMetricsFeatureProvider;
|
||||||
@@ -48,23 +54,18 @@ public class DreamPickerController extends BasePreferenceController {
|
|||||||
private DreamInfo mActiveDream;
|
private DreamInfo mActiveDream;
|
||||||
private DreamAdapter mAdapter;
|
private DreamAdapter mAdapter;
|
||||||
|
|
||||||
public DreamPickerController(Context context) {
|
public DreamPickerController(Context context, String key) {
|
||||||
this(context, DreamBackend.getInstance(context));
|
this(context, key, DreamBackend.getInstance(context));
|
||||||
}
|
}
|
||||||
|
|
||||||
public DreamPickerController(Context context, DreamBackend backend) {
|
public DreamPickerController(Context context, String key, DreamBackend backend) {
|
||||||
super(context, KEY);
|
super(context, key);
|
||||||
mBackend = backend;
|
mBackend = backend;
|
||||||
mDreamInfos = mBackend.getDreamInfos();
|
mDreamInfos = mBackend.getDreamInfos();
|
||||||
mActiveDream = getActiveDreamInfo(mDreamInfos);
|
mActiveDream = getActiveDreamInfo(mDreamInfos);
|
||||||
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
|
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPreferenceKey() {
|
|
||||||
return KEY;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getAvailabilityStatus() {
|
public int getAvailabilityStatus() {
|
||||||
return mDreamInfos.size() > 0 ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
|
return mDreamInfos.size() > 0 ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
|
||||||
@@ -79,6 +80,8 @@ public class DreamPickerController extends BasePreferenceController {
|
|||||||
.map(DreamItem::new)
|
.map(DreamItem::new)
|
||||||
.collect(Collectors.toList()));
|
.collect(Collectors.toList()));
|
||||||
|
|
||||||
|
mAdapter.setEnabled(mBackend.isEnabled());
|
||||||
|
|
||||||
final LayoutPreference pref = screen.findPreference(getPreferenceKey());
|
final LayoutPreference pref = screen.findPreference(getPreferenceKey());
|
||||||
if (pref == null) {
|
if (pref == null) {
|
||||||
return;
|
return;
|
||||||
@@ -89,6 +92,11 @@ public class DreamPickerController extends BasePreferenceController {
|
|||||||
new GridSpacingItemDecoration(mContext, R.dimen.dream_preference_card_padding));
|
new GridSpacingItemDecoration(mContext, R.dimen.dream_preference_card_padding));
|
||||||
recyclerView.setHasFixedSize(true);
|
recyclerView.setHasFixedSize(true);
|
||||||
recyclerView.setAdapter(mAdapter);
|
recyclerView.setAdapter(mAdapter);
|
||||||
|
|
||||||
|
final Preference mainSwitchPref = screen.findPreference(MAIN_SWITCH_PREF_KEY);
|
||||||
|
if (mainSwitchPref instanceof MainSwitchPreference) {
|
||||||
|
((MainSwitchPreference) mainSwitchPref).addOnSwitchChangeListener(this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
@@ -100,6 +108,13 @@ public class DreamPickerController extends BasePreferenceController {
|
|||||||
.orElse(null);
|
.orElse(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onSwitchChanged(Switch switchView, boolean isChecked) {
|
||||||
|
if (mAdapter != null) {
|
||||||
|
mAdapter.setEnabled(isChecked);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private class DreamItem implements IDreamItem {
|
private class DreamItem implements IDreamItem {
|
||||||
DreamInfo mDreamInfo;
|
DreamInfo mDreamInfo;
|
||||||
|
|
||||||
|
@@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
package com.android.settings.dream;
|
package com.android.settings.dream;
|
||||||
|
|
||||||
|
import static com.android.settings.dream.DreamMainSwitchPreferenceController.MAIN_SWITCH_PREF_KEY;
|
||||||
import static com.android.settingslib.dream.DreamBackend.EITHER;
|
import static com.android.settingslib.dream.DreamBackend.EITHER;
|
||||||
import static com.android.settingslib.dream.DreamBackend.NEVER;
|
import static com.android.settingslib.dream.DreamBackend.NEVER;
|
||||||
import static com.android.settingslib.dream.DreamBackend.WHILE_CHARGING;
|
import static com.android.settingslib.dream.DreamBackend.WHILE_CHARGING;
|
||||||
@@ -25,10 +26,13 @@ import android.app.settings.SettingsEnums;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
|
import android.widget.Switch;
|
||||||
|
|
||||||
import androidx.annotation.VisibleForTesting;
|
import androidx.annotation.VisibleForTesting;
|
||||||
|
import androidx.preference.PreferenceCategory;
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
@@ -38,12 +42,14 @@ import com.android.settingslib.core.AbstractPreferenceController;
|
|||||||
import com.android.settingslib.dream.DreamBackend;
|
import com.android.settingslib.dream.DreamBackend;
|
||||||
import com.android.settingslib.dream.DreamBackend.WhenToDream;
|
import com.android.settingslib.dream.DreamBackend.WhenToDream;
|
||||||
import com.android.settingslib.search.SearchIndexable;
|
import com.android.settingslib.search.SearchIndexable;
|
||||||
|
import com.android.settingslib.widget.MainSwitchPreference;
|
||||||
|
import com.android.settingslib.widget.OnMainSwitchChangeListener;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@SearchIndexable
|
@SearchIndexable
|
||||||
public class DreamSettings extends DashboardFragment {
|
public class DreamSettings extends DashboardFragment implements OnMainSwitchChangeListener {
|
||||||
|
|
||||||
private static final String TAG = "DreamSettings";
|
private static final String TAG = "DreamSettings";
|
||||||
static final String WHILE_CHARGING_ONLY = "while_charging_only";
|
static final String WHILE_CHARGING_ONLY = "while_charging_only";
|
||||||
@@ -51,6 +57,13 @@ public class DreamSettings extends DashboardFragment {
|
|||||||
static final String EITHER_CHARGING_OR_DOCKED = "either_charging_or_docked";
|
static final String EITHER_CHARGING_OR_DOCKED = "either_charging_or_docked";
|
||||||
static final String NEVER_DREAM = "never";
|
static final String NEVER_DREAM = "never";
|
||||||
|
|
||||||
|
private static final String MAIN_PREF_CATEGORY = "dream_main_category";
|
||||||
|
|
||||||
|
private MainSwitchPreference mMainSwitchPreference;
|
||||||
|
private PreferenceCategory mMainPrefCategory;
|
||||||
|
private Button mPreviewButton;
|
||||||
|
private RecyclerView mRecyclerView;
|
||||||
|
|
||||||
@WhenToDream
|
@WhenToDream
|
||||||
static int getSettingFromPrefKey(String key) {
|
static int getSettingFromPrefKey(String key) {
|
||||||
switch (key) {
|
switch (key) {
|
||||||
@@ -135,37 +148,58 @@ public class DreamSettings extends DashboardFragment {
|
|||||||
|
|
||||||
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
|
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
|
||||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||||
controllers.add(new DreamPickerController(context));
|
|
||||||
controllers.add(new WhenToDreamPreferenceController(context));
|
controllers.add(new WhenToDreamPreferenceController(context));
|
||||||
return controllers;
|
return controllers;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
|
public void onCreate(Bundle icicle) {
|
||||||
Bundle bundle) {
|
super.onCreate(icicle);
|
||||||
|
|
||||||
final ViewGroup root = getActivity().findViewById(android.R.id.content);
|
|
||||||
final Button previewButton = (Button) getActivity().getLayoutInflater().inflate(
|
|
||||||
R.layout.dream_preview_button, root, false);
|
|
||||||
root.addView(previewButton);
|
|
||||||
|
|
||||||
final DreamBackend dreamBackend = DreamBackend.getInstance(getContext());
|
final DreamBackend dreamBackend = DreamBackend.getInstance(getContext());
|
||||||
previewButton.setOnClickListener(v -> dreamBackend.preview(dreamBackend.getActiveDream()));
|
|
||||||
|
|
||||||
final RecyclerView recyclerView = super.onCreateRecyclerView(inflater, parent, bundle);
|
mMainSwitchPreference = findPreference(MAIN_SWITCH_PREF_KEY);
|
||||||
previewButton.post(() -> {
|
if (mMainSwitchPreference != null) {
|
||||||
recyclerView.setPadding(0, 0, 0, previewButton.getMeasuredHeight());
|
mMainSwitchPreference.addOnSwitchChangeListener(this);
|
||||||
});
|
|
||||||
return recyclerView;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER
|
mMainPrefCategory = findPreference(MAIN_PREF_CATEGORY);
|
||||||
= new BaseSearchIndexProvider(R.xml.dream_fragment_overview) {
|
if (mMainPrefCategory != null) {
|
||||||
|
mMainPrefCategory.setEnabled(dreamBackend.isEnabled());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
|
||||||
return buildPreferenceControllers(context);
|
Bundle bundle) {
|
||||||
}
|
final DreamBackend dreamBackend = DreamBackend.getInstance(getContext());
|
||||||
};
|
|
||||||
|
final ViewGroup root = getActivity().findViewById(android.R.id.content);
|
||||||
|
mPreviewButton = (Button) getActivity().getLayoutInflater().inflate(
|
||||||
|
R.layout.dream_preview_button, root, false);
|
||||||
|
mPreviewButton.setVisibility(dreamBackend.isEnabled() ? View.VISIBLE : View.GONE);
|
||||||
|
root.addView(mPreviewButton);
|
||||||
|
mPreviewButton.setOnClickListener(v -> dreamBackend.preview(dreamBackend.getActiveDream()));
|
||||||
|
|
||||||
|
mRecyclerView = super.onCreateRecyclerView(inflater, parent, bundle);
|
||||||
|
updatePaddingForPreviewButton();
|
||||||
|
return mRecyclerView;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updatePaddingForPreviewButton() {
|
||||||
|
mPreviewButton.post(() -> {
|
||||||
|
mRecyclerView.setPadding(0, 0, 0, mPreviewButton.getMeasuredHeight());
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onSwitchChanged(Switch switchView, boolean isChecked) {
|
||||||
|
mMainPrefCategory.setEnabled(isChecked);
|
||||||
|
mPreviewButton.setVisibility(isChecked ? View.VISIBLE : View.GONE);
|
||||||
|
updatePaddingForPreviewButton();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||||
|
new BaseSearchIndexProvider(R.xml.dream_fragment_overview);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -0,0 +1,143 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2020 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.dream;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.provider.Settings;
|
||||||
|
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
|
|
||||||
|
import com.android.settingslib.dream.DreamBackend;
|
||||||
|
import com.android.settingslib.widget.MainSwitchPreference;
|
||||||
|
import com.android.settingslib.widget.OnMainSwitchChangeListener;
|
||||||
|
|
||||||
|
import org.junit.After;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Answers;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
import org.robolectric.annotation.Config;
|
||||||
|
import org.robolectric.shadow.api.Shadow;
|
||||||
|
import org.robolectric.shadows.ShadowContentResolver;
|
||||||
|
import org.robolectric.shadows.ShadowSettings;
|
||||||
|
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
@Config(shadows = {ShadowSettings.ShadowSecure.class})
|
||||||
|
public class DreamMainSwitchPreferenceControllerTest {
|
||||||
|
|
||||||
|
private Context mContext;
|
||||||
|
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||||
|
private PreferenceScreen mScreen;
|
||||||
|
private DreamMainSwitchPreferenceController mController;
|
||||||
|
private MainSwitchPreference mPreference;
|
||||||
|
private DreamBackend mBackend;
|
||||||
|
@Mock
|
||||||
|
private OnMainSwitchChangeListener mChangeListener;
|
||||||
|
private ShadowContentResolver mShadowContentResolver;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
mContext = ApplicationProvider.getApplicationContext();
|
||||||
|
mShadowContentResolver = Shadow.extract(mContext.getContentResolver());
|
||||||
|
mBackend = DreamBackend.getInstance(mContext);
|
||||||
|
mController = new DreamMainSwitchPreferenceController(mContext, "key");
|
||||||
|
mPreference = new MainSwitchPreference(mContext);
|
||||||
|
mPreference.setKey(mController.getPreferenceKey());
|
||||||
|
when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
|
||||||
|
mController.displayPreference(mScreen);
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void tearDown() {
|
||||||
|
ShadowSettings.ShadowSecure.reset();
|
||||||
|
mController.onStop();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testIsChecked_returnsFalse() {
|
||||||
|
mBackend.setEnabled(false);
|
||||||
|
assertThat(mController.isChecked()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testIsChecked_returnsTrue() {
|
||||||
|
mBackend.setEnabled(true);
|
||||||
|
assertThat(mController.isChecked()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testSetChecked_setFalse_disablesSetting() {
|
||||||
|
mBackend.setEnabled(true);
|
||||||
|
mController.setChecked(false);
|
||||||
|
assertThat(mBackend.isEnabled()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testSetChecked_setTrue_enablesSetting() {
|
||||||
|
mBackend.setEnabled(false);
|
||||||
|
mController.setChecked(true);
|
||||||
|
assertThat(mBackend.isEnabled()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testIsSliceable_returnsFalse() {
|
||||||
|
assertThat(mController.isSliceable()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testRegisterAndUnregister() {
|
||||||
|
mController.onStart();
|
||||||
|
assertThat(mShadowContentResolver.getContentObservers(
|
||||||
|
Settings.Secure.getUriFor(Settings.Secure.SCREENSAVER_ENABLED))).hasSize(1);
|
||||||
|
|
||||||
|
mController.onStop();
|
||||||
|
assertThat(mShadowContentResolver.getContentObservers(
|
||||||
|
Settings.Secure.getUriFor(Settings.Secure.SCREENSAVER_ENABLED))).isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUpdateState() {
|
||||||
|
mController.onStart();
|
||||||
|
|
||||||
|
mBackend.setEnabled(true);
|
||||||
|
triggerOnChangeListener();
|
||||||
|
assertThat(mPreference.isChecked()).isTrue();
|
||||||
|
|
||||||
|
mBackend.setEnabled(false);
|
||||||
|
triggerOnChangeListener();
|
||||||
|
assertThat(mPreference.isChecked()).isFalse();
|
||||||
|
|
||||||
|
mBackend.setEnabled(true);
|
||||||
|
triggerOnChangeListener();
|
||||||
|
assertThat(mPreference.isChecked()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void triggerOnChangeListener() {
|
||||||
|
mShadowContentResolver.getContentObservers(
|
||||||
|
Settings.Secure.getUriFor(Settings.Secure.SCREENSAVER_ENABLED))
|
||||||
|
.forEach(contentObserver -> contentObserver.onChange(false));
|
||||||
|
}
|
||||||
|
}
|
@@ -62,7 +62,8 @@ public class DreamPickerControllerTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private DreamPickerController buildController() {
|
private DreamPickerController buildController() {
|
||||||
final DreamPickerController controller = new DreamPickerController(mContext, mBackend);
|
final DreamPickerController controller = new DreamPickerController(mContext, "key",
|
||||||
|
mBackend);
|
||||||
controller.displayPreference(mScreen);
|
controller.displayPreference(mScreen);
|
||||||
return controller;
|
return controller;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user