Update the "When to dream" settings
For devices which don't support dreaming on battery, we can offer simpler options since the device must always be charging for screensavers to appear. Therefore there are only two options: 1. While charging 2. While docked and charging Test: flashed and verified on device Test: make -j64 RunSettingsRoboTests Fixes: 226187572 Change-Id: I6ed24cda8874f2fb941f6cfded9ed97ed78a3cb6
This commit is contained in:
@@ -90,12 +90,14 @@ public class DreamSettings extends DashboardFragment implements OnMainSwitchChan
|
||||
}
|
||||
}
|
||||
|
||||
static int getDreamSettingDescriptionResId(@WhenToDream int dreamSetting) {
|
||||
static int getDreamSettingDescriptionResId(@WhenToDream int dreamSetting,
|
||||
boolean enabledOnBattery) {
|
||||
switch (dreamSetting) {
|
||||
case WHILE_CHARGING:
|
||||
return R.string.screensaver_settings_summary_sleep;
|
||||
case WHILE_DOCKED:
|
||||
return R.string.screensaver_settings_summary_dock;
|
||||
return enabledOnBattery ? R.string.screensaver_settings_summary_dock
|
||||
: R.string.screensaver_settings_summary_dock_and_charging;
|
||||
case EITHER:
|
||||
return R.string.screensaver_settings_summary_either_long;
|
||||
case NEVER:
|
||||
|
@@ -32,12 +32,15 @@ public class WhenToDreamPicker extends RadioButtonPickerFragment {
|
||||
|
||||
private static final String TAG = "WhenToDreamPicker";
|
||||
private DreamBackend mBackend;
|
||||
private boolean mDreamsSupportedOnBattery;
|
||||
|
||||
@Override
|
||||
public void onAttach(Context context) {
|
||||
super.onAttach(context);
|
||||
|
||||
mBackend = DreamBackend.getInstance(context);
|
||||
mDreamsSupportedOnBattery = getResources().getBoolean(
|
||||
com.android.internal.R.bool.config_dreamsEnabledOnBattery);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -69,11 +72,17 @@ public class WhenToDreamPicker extends RadioButtonPickerFragment {
|
||||
}
|
||||
|
||||
private String[] entries() {
|
||||
return getResources().getStringArray(R.array.when_to_start_screensaver_entries);
|
||||
if (mDreamsSupportedOnBattery) {
|
||||
return getResources().getStringArray(R.array.when_to_start_screensaver_entries);
|
||||
}
|
||||
return getResources().getStringArray(R.array.when_to_start_screensaver_entries_no_battery);
|
||||
}
|
||||
|
||||
private String[] keys() {
|
||||
return getResources().getStringArray(R.array.when_to_start_screensaver_values);
|
||||
if (mDreamsSupportedOnBattery) {
|
||||
return getResources().getStringArray(R.array.when_to_start_screensaver_values);
|
||||
}
|
||||
return getResources().getStringArray(R.array.when_to_start_screensaver_values_no_battery);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -33,19 +33,24 @@ public class WhenToDreamPreferenceController extends AbstractPreferenceControlle
|
||||
private static final String WHEN_TO_START = "when_to_start";
|
||||
private final DreamBackend mBackend;
|
||||
private final boolean mDreamsDisabledByAmbientModeSuppression;
|
||||
private final boolean mDreamsEnabledOnBattery;
|
||||
|
||||
WhenToDreamPreferenceController(Context context) {
|
||||
this(context, context.getResources().getBoolean(
|
||||
com.android.internal.R.bool.config_dreamsDisabledByAmbientModeSuppressionConfig));
|
||||
com.android.internal.R.bool.config_dreamsDisabledByAmbientModeSuppressionConfig),
|
||||
context.getResources().getBoolean(
|
||||
com.android.internal.R.bool.config_dreamsEnabledOnBattery));
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
WhenToDreamPreferenceController(Context context,
|
||||
boolean dreamsDisabledByAmbientModeSuppression) {
|
||||
boolean dreamsDisabledByAmbientModeSuppression,
|
||||
boolean dreamsEnabledOnBattery) {
|
||||
super(context);
|
||||
|
||||
mBackend = DreamBackend.getInstance(context);
|
||||
mDreamsDisabledByAmbientModeSuppression = dreamsDisabledByAmbientModeSuppression;
|
||||
mDreamsEnabledOnBattery = dreamsEnabledOnBattery;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -57,7 +62,7 @@ public class WhenToDreamPreferenceController extends AbstractPreferenceControlle
|
||||
preference.setSummary(R.string.screensaver_settings_when_to_dream_bedtime);
|
||||
} else {
|
||||
final int resId = DreamSettings.getDreamSettingDescriptionResId(
|
||||
mBackend.getWhenToDreamSetting());
|
||||
mBackend.getWhenToDreamSetting(), mDreamsEnabledOnBattery);
|
||||
preference.setSummary(resId);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user