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

Commit 27c69d5e authored by Daniel Velazco's avatar Daniel Velazco
Browse files

added screensaver timeout option in the settings

parent a7e28fff

res/values-de/strings.xml

+14 −0
Original line number Diff line number Diff line
@@ -124,4 +124,18 @@ 
      <item>90 Minuten</item>

      <item>120 Minuten</item>

    </string-array>

    

    <!-- Setting title for setting alarm time limit -->

    <string name="screensaver_timeout_title">Screensaver timeout</string>

    

    <!-- Entries listed in the ListPreference when invoking the max alarm duration

         preference. -->

    <string-array name="screensaver_timeout_entries">

      <item>1 Minute</item>

      <item>5 Minuten</item>

      <item>10 Minuten</item>

      <item>15 Minuten</item>

      <item>30 Minuten</item>

      <item>60 Minuten</item>

    </string-array>

</resources>

res/values-it/strings.xml

+14 −0
Original line number Diff line number Diff line
@@ -124,4 +124,18 @@ 
      <item>90 minuti</item>

      <item>120 minuti</item>

    </string-array>

    

    <!-- Setting title for setting alarm time limit -->

    <string name="screensaver_timeout_title">Salvaschermo</string>

    

    <!-- Entries listed in the ListPreference when invoking the max alarm duration

         preference. -->

    <string-array name="screensaver_timeout_entries">

      <item>1 minuto</item>

      <item>5 minuti</item>

      <item>10 minuti</item>

      <item>15 minuti</item>

      <item>30 minuti</item>

      <item>60 minuti</item>

    </string-array>

</resources>

res/values/strings.xml

+25 −0
Original line number Diff line number Diff line
@@ -277,6 +277,31 @@ 
      <item>120</item>

    </string-array>

    

    <!-- Setting title for setting alarm time limit -->

    <string name="screensaver_timeout_title">Screensaver timeout</string>

    

    <!-- Entries listed in the ListPreference when invoking the max alarm duration

         preference. -->

    <string-array name="screensaver_timeout_entries">

      <item>1 minute</item>

      <item>5 minutes</item>

      <item>10 minutes</item>

      <item>15 minutes</item>

      <item>30 minutes</item>

      <item>60 minutes</item>

    </string-array>



    <!-- Values that are retrieved from the ListPreference. These must match

         the alarm_limit_entries above. -->

    <string-array name="screensaver_timeout_values">

      <item>1</item>

      <item>5</item>

      <item>10</item>

      <item>15</item>

      <item>30</item>

      <item>60</item>

    </string-array>

    

</resources>

res/xml/settings.xml

+8 −0
Original line number Diff line number Diff line
@@ -55,4 +55,12 @@ 
        android:defaultValue="30" 

        android:dialogTitle="@string/alarm_limit_title"/>

        

	<ListPreference

		android:key="screensaver_timeout"

		android:title="@string/screensaver_timeout_title"

        android:entries="@array/screensaver_timeout_entries"

        android:entryValues="@array/screensaver_timeout_values"

        android:defaultValue="5" 

        android:dialogTitle="@string/screensaver_timeout_title"/>

		

</PreferenceScreen>

src/com/android/deskclock/DeskClock.java

+8 −2
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.os.Handler; 
import android.os.Message;

import android.os.SystemClock;

import android.os.PowerManager;

import android.preference.PreferenceManager;

import android.provider.Settings;

import android.provider.MediaStore;

import android.text.TextUtils;
@@ -106,7 +107,8 @@ public class DeskClock extends Activity { 
    private static final String DOCK_SETTINGS_ACTION = "com.android.settings.DOCK_SETTINGS";



    // Delay before engaging the burn-in protection mode (cyan-on-black).

    private final long SCREEN_SAVER_TIMEOUT = 5* 60 * 1000; // 5 min

    //private final long SCREEN_SAVER_TIMEOUT = 5* 60 * 1000; // 5 min

    private final String SCREEN_SAVER_TIMEOUT_DEFAULT = "5";



    // Repositioning delay in screen saver.

    private final long SCREEN_SAVER_MOVE_DELAY = 60 * 1000; // 1 min
@@ -272,11 +274,15 @@ public class DeskClock extends Activity { 
    }



    private void scheduleScreenSaver() {

    	String screensaver_timeout = PreferenceManager.getDefaultSharedPreferences(this)

    	.getString(SettingsActivity.SCREENSAVER_TIMEOUT, SCREEN_SAVER_TIMEOUT_DEFAULT);

    	Long timeout = (Long.parseLong(screensaver_timeout)) * 60 * 1000;

    	

        // reschedule screen saver

        mHandy.removeMessages(SCREEN_SAVER_TIMEOUT_MSG);

        mHandy.sendMessageDelayed(

            Message.obtain(mHandy, SCREEN_SAVER_TIMEOUT_MSG),

            SCREEN_SAVER_TIMEOUT);

            timeout);

    }



    private void restoreScreen() {