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

Commit 6f0ea441 authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Settings changes for Android Dreams (now Screen Candy). 

- new preference design
- remove candy-specific timeout
- use new settings keys

Requires Change I31f31b3

Bug: 5591015
Change-Id: I45cb6ea5c68f9932c6d4e65e2b219331d48a62d6
parent cee089b1

res/values/strings.xml

+13 −8
Original line number Diff line number Diff line
@@ -1619,19 +1619,24 @@ 
    <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->

    <string name="wallpaper_settings_fragment_title">Choose wallpaper from</string>

    <!-- Display settings screen, trigger for screen saver options -->

    <string name="dream_settings_title">Android Dreams</string>

    <!-- Display settings screen, summary for screen saver options -->

    <string name="dream_settings_summary">Screen savers and other idle diversions</string>

    <string name="screensaver_settings_title">Screen Candy</string>

    <!-- Display settings screen, summary for screen saver options, screen saver is turned on -->

    <string name="screensaver_settings_summary_on">Will start upon sleep if connected to power</string>

    <!-- Display settings screen, summary for screen saver options, screen saver is turned off -->

    <string name="screensaver_settings_summary_off">Disabled</string>

    <!-- Screen saver settings, setting option name to select a module -->

    <string name="dream_component_title">Selected dream</string>

    <string name="screensaver_component_title">Selected candy</string>

    <!-- Screen saver settings, setting option name to change activation timeout -->

    <string name="dream_timeout_title">When to activate</string>

    <string name="screensaver_timeout_title">When to activate</string>

    <!-- Screen saver settings, setting option summary to change activation timeout -->

    <string name="dream_timeout_summary">After <xliff:g id="timeout_description">%1$s</xliff:g> spent idle</string>

    <string name="screensaver_timeout_summary">After <xliff:g id="timeout_description">%1$s</xliff:g> spent idle</string>

    <!-- Screen saver settings, setting option summary to change activation timeout, shown when disabled -->

    <string name="dream_timeout_zero_summary">Never</string>

    <string name="screensaver_timeout_zero_summary">Never</string>

    <!-- Screen saver settings, button allowing the user to test/try the current module -->

    <string name="dream_test">Try it!</string>

    <string name="screensaver_test">Try it!</string>

    <!-- Screen saver settings, checkbox allowing the screen saver to activate automatically when

         the device is docked -->

    <string name="screensaver_activate_on_dock_title">Also start when docked</string>

    <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->

    <string name="automatic_brightness">Automatic brightness</string>

    <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->

res/xml/display_settings.xml

+3 −3
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ 
                android:entryValues="@array/screen_timeout_values" />



        <PreferenceScreen

                android:title="@string/dream_settings_title" 

                android:summary="@string/dream_settings_summary"

                android:key="screensaver"

                android:title="@string/screensaver_settings_title"

                android:fragment="com.android.settings.DreamSettings" />



        <ListPreference

res/xml/dream_settings.xml

+11 −13
Original line number Diff line number Diff line
@@ -15,27 +15,25 @@ 
-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

        android:title="@string/dream_settings_title"

        android:title="@string/screensaver_settings_title"

        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">



    <com.android.settings.DreamComponentPreference

            android:key="dream_component"

            android:title="@string/dream_component_title"

            android:key="screensaver_component"

            android:title="@string/screensaver_component_title"

            android:persistent="false"

            />



    <ListPreference

            android:key="dream_timeout"

            android:title="@string/dream_timeout_title"

            android:summary="@string/dream_timeout_summary"

            android:persistent="false"

            android:entries="@array/dream_timeout_entries"

            android:entryValues="@array/dream_timeout_values" />

    

    <com.android.settings.DreamTesterPreference

            android:key="dream_test"

            android:title="@string/dream_test"

            android:key="test"

            android:title="@string/screensaver_test"

            android:persistent="false"

            />



    <CheckBoxPreference

            android:key="activate_on_dock"

            android:persistent="false"

            android:title="@string/screensaver_activate_on_dock_title"

            android:defaultValue="true" />



</PreferenceScreen>

src/com/android/settings/DisplaySettings.java

+14 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ import android.util.Log; 
import android.view.IWindowManager;

import android.view.Surface;



import com.android.settings.DreamSettings;



import java.util.ArrayList;



public class DisplaySettings extends SettingsPreferenceFragment implements
@@ -52,6 +54,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
    private static final String KEY_ACCELEROMETER = "accelerometer";

    private static final String KEY_FONT_SIZE = "font_size";

    private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";

    private static final String KEY_SCREEN_SAVER = "screensaver";



    private CheckBoxPreference mAccelerometer;

    private ListPreference mFontSizePref;
@@ -60,6 +63,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
    private final Configuration mCurConfig = new Configuration();

    

    private ListPreference mScreenTimeoutPreference;

    private Preference mScreenSaverPreference;



    private ContentObserver mAccelerometerRotationObserver = new ContentObserver(new Handler()) {

        @Override
@@ -78,6 +82,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
        mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);

        mAccelerometer.setPersistent(false);



        mScreenSaverPreference = findPreference(KEY_SCREEN_SAVER);



        mScreenTimeoutPreference = (ListPreference) findPreference(KEY_SCREEN_TIMEOUT);

        final long currentTimeout = Settings.System.getLong(resolver, SCREEN_OFF_TIMEOUT,

                FALLBACK_SCREEN_TIMEOUT_VALUE);
@@ -213,6 +219,14 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
    private void updateState() {

        updateAccelerometerRotationCheckbox();

        readFontSizePreference(mFontSizePref);

        updateScreenSaverSummary();

    }



    private void updateScreenSaverSummary() {

        mScreenSaverPreference.setSummary(

            DreamSettings.isScreenSaverEnabled(mScreenSaverPreference.getContext())

                ? R.string.screensaver_settings_summary_on

                : R.string.screensaver_settings_summary_off);

    }



    private void updateAccelerometerRotationCheckbox() {

src/com/android/settings/DreamComponentPreference.java

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.settings;



import static android.provider.Settings.Secure.DREAM_COMPONENT;

import static android.provider.Settings.Secure.SCREENSAVER_COMPONENT;



import android.app.AlertDialog;

import android.content.Context;
@@ -65,7 +65,7 @@ public class DreamComponentPreference extends Preference { 
    }



    private void refreshFromSettings() {

        String component = Settings.Secure.getString(resolver, DREAM_COMPONENT);

        String component = Settings.Secure.getString(resolver, SCREENSAVER_COMPONENT);

        if (component == null) {

            component = getContext().getResources().getString(

                com.android.internal.R.string.config_defaultDreamComponent);
@@ -168,7 +168,7 @@ public class DreamComponentPreference extends Preference { 
                        setSummary(ri.loadLabel(pm));

                        //getContext().startActivity(intent);

                        

                        Settings.Secure.putString(resolver, DREAM_COMPONENT, cn.flattenToString());

                        Settings.Secure.putString(resolver, SCREENSAVER_COMPONENT, cn.flattenToString());

                    }

                })

            .create();