Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e7f4d87 authored by Lucas Silva's avatar Lucas Silva Committed by Automerger Merge Worker
Browse files

Update the "When to dream" settings am: 47d84b41 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20302008



Change-Id: Id0ae8f8af81ab9cea7e61b1050e077afbe51a1f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1be259b7 47d84b41

res/values/arrays.xml

+14 −0
Original line number Diff line number Diff line
@@ -1216,6 +1216,20 @@ 
        <item>90</item>

    </string-array>



    <!-- Options for screensaver "When to start" for devices that do not support screensavers

         while on battery -->

    <string-array name="when_to_start_screensaver_entries_no_battery" translatable="false">

        <item>@string/screensaver_settings_summary_sleep</item>

        <item>@string/screensaver_settings_summary_dock_and_charging</item>

    </string-array>



    <!-- Values for screensaver "When to start" for devices that do not support screensavers

         while on battery -->

    <string-array name="when_to_start_screensaver_values_no_battery" translatable="false">

        <item>while_charging_only</item>

        <item>while_docked_only</item>

    </string-array>



    <string-array name="when_to_start_screensaver_entries" translatable="false">

        <item>@string/screensaver_settings_summary_sleep</item>

        <item>@string/screensaver_settings_summary_dock</item>

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -3371,6 +3371,8 @@ 
    <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 [CHAR LIMIT=35] -->

    <string name="screensaver_settings_summary_either_long">While charging or docked</string>

    <!-- Display settings screen, summary fragment for screen saver options, actived while docked and charging [CHAR LIMIT=35] -->

    <string name="screensaver_settings_summary_dock_and_charging">While docked and charging</string>

    <!-- Display settings screen, summary fragment for screen saver options, activated when asleep and charging [CHAR LIMIT=35] -->

    <string name="screensaver_settings_summary_sleep">While charging</string>

    <!-- Display settings screen, summary fragment for screen saver options, activated when docked [CHAR LIMIT=35] -->

src/com/android/settings/dream/DreamSettings.java

+4 −2
Original line number Diff line number Diff line
@@ -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:

src/com/android/settings/dream/WhenToDreamPicker.java

+11 −2
Original line number Diff line number Diff line
@@ -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,12 +72,18 @@ public class WhenToDreamPicker extends RadioButtonPickerFragment { 
    }



    private String[] 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() {

        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

    protected String getDefaultKey() {

src/com/android/settings/dream/WhenToDreamPreferenceController.java

+8 −3
Original line number Diff line number Diff line
@@ -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);

        }

    }