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

Commit 849c3eeb authored by Michael Webster's avatar Michael Webster
Browse files

Added alarm duration to settings, 30 min was hard value - not enough for me! 



Signed-off-by: default avatarMichael Webster <miketwebster@gmail.com>
parent fad0919e

res/values/strings.xml

+27 −0
Original line number Diff line number Diff line
@@ -250,6 +250,33 @@ 
    <string name="alarm_requires_unlock_title">Alarm requires unlock</string>

    <string name="alarm_requires_unlock_summary">Must unlock phone to disable or snooze alarm</string>

    <string name="menu_item_dock_settings" msgid="9161438664257429372">Dock settings</string>

    

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

    <string name="alarm_limit_title">Maximum alarm duration</string>



    <!-- Entries listed in the ListPreference when invoking the snooze duration

         preference. -->

    <string-array name="alarm_limit_entries">

      <item>15 minutes</item>

      <item>30 minutes</item>

      <item>45 minutes</item>

      <item>60 minutes</item>

      <item>90 minutes</item>

      <item>120 minutes</item>

    </string-array>



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

         the alarm_limit_entries above. -->

    <string-array name="alarm_limit_values">

      <item>15</item>

      <item>30</item>

      <item>45</item>

      <item>60</item>

      <item>90</item>

      <item>120</item>

    </string-array>

    

    

</resources>

res/xml/settings.xml

+7 −0
Original line number Diff line number Diff line
@@ -51,4 +51,11 @@ 
        android:summary="@string/volume_button_setting_summary"

        android:defaultValue="2" />



	<ListPreference

		android:key="alarm_limit"

		android:title="@string/alarm_limit_title"

        android:entries="@array/alarm_limit_entries"

        android:entryValues="@array/alarm_limit_values"

        android:defaultValue="30" />

		

</PreferenceScreen>

src/com/android/deskclock/AlarmKlaxon.java

+13 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.Handler; 
import android.os.IBinder;

import android.os.Message;

import android.os.Vibrator;

import android.preference.PreferenceManager;

import android.telephony.PhoneStateListener;

import android.telephony.TelephonyManager;
@@ -41,7 +42,18 @@ import android.telephony.TelephonyManager; 
public class AlarmKlaxon extends Service {



    /** Play alarm up to 10 minutes before silencing */

    private static final int ALARM_TIMEOUT_SECONDS = 30 * 60;

/**    private static final int ALARM_TIMEOUT_SECONDS = 30 * 60; */

	

	private static final String DEFAULT_ALARM_LIMIT = "30";

	

	final String alarmdur =

        PreferenceManager.getDefaultSharedPreferences(this)

        .getString(SettingsActivity.KEY_ALARM_LIMIT, DEFAULT_ALARM_LIMIT);



	int alarmtimeout = Integer.parseInt(alarmdur);

		

	private final int ALARM_TIMEOUT_SECONDS = alarmtimeout * 60;

	



    private static final long[] sVibratePattern = new long[] { 500, 500 };

src/com/android/deskclock/SettingsActivity.java

+8 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ public class SettingsActivity extends PreferenceActivity 
            "volume_button_setting";

    static final String KEY_ALARM_REQUIRES_UNLOCK = 

    		"alarm_requires_unlock";

    static final String KEY_ALARM_LIMIT =

    		"alarm_limit";

    

    

    @Override
@@ -106,6 +108,12 @@ public class SettingsActivity extends PreferenceActivity 
                (ListPreference) findPreference(KEY_ALARM_SNOOZE);

        snooze.setSummary(snooze.getEntry());

        snooze.setOnPreferenceChangeListener(this);

        

        final ListPreference alarmlimit =

        		(ListPreference) findPreference(KEY_ALARM_LIMIT);

        alarmlimit.setSummary(alarmlimit.getEntry());

        alarmlimit.setOnPreferenceChangeListener(this);

        

    }



}