Update the "When to dream" settings am: 47d84b41ac
am: 0e7f4d87ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20302008 Change-Id: Id60e4ff240602ef42905a5af46f0ac77bde17f9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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:
|
||||
|
Reference in New Issue
Block a user