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

Commit bd9eae10 authored by James Lemieux's avatar James Lemieux
Browse files

Present Clock's timer beep as the default ringtone

A "settings" package was introduced as a byproduct of this CL.

When choosing the preferred ringtone for timers, the default
selection should play timer_expired.ogg which ships with the
application. This is the only sound played on all prior version of
the application.

Known Issue: the dialog will label the default as
"Default alarm sound". This will be fixed in a later CL.

Change-Id: I4e9c6663c597038ec273b699cdda3a036b376350
parent c254e35c
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@
            </intent-filter>
        </activity-alias>

        <activity android:name="SettingsActivity"
        <activity android:name=".settings.SettingsActivity"
                android:label="@string/settings"
                android:theme="@style/SettingsTheme"
                android:taskAffinity=""
@@ -295,7 +295,7 @@
        </service>

        <!-- Settings activity for screensaver -->
        <activity android:name=".ScreensaverSettingsActivity"
        <activity android:name=".settings.ScreensaverSettingsActivity"
                android:label="@string/screensaver_settings"
                android:theme="@style/SettingsTheme"
                android:taskAffinity=""
+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@
<fragment
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/main"
    android:name="com.android.deskclock.ScreensaverSettingsActivity$PrefsFragment"
    android:name="com.android.deskclock.settings.ScreensaverSettingsActivity$PrefsFragment"
    android:layout_width="match_parent"
    android:layout_height="match_parent" />
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@
<fragment
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/main"
    android:name="com.android.deskclock.SettingsActivity$PrefsFragment"
    android:name="com.android.deskclock.settings.SettingsActivity$PrefsFragment"
    android:layout_width="match_parent"
    android:layout_height="match_parent" />
+1 −1
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<dream xmlns:android="http://schemas.android.com/apk/res/android"
    android:settingsActivity="com.android.deskclock.ScreensaverSettingsActivity"
    android:settingsActivity="com.android.deskclock.settings.ScreensaverSettingsActivity"
    />
+4 −4
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@
            android:defaultValue="10"
            android:dialogTitle="@string/auto_silence_title" />

       <com.android.deskclock.SnoozeLengthDialog
       <com.android.deskclock.settings.SnoozeLengthDialog
            android:key="snooze_duration"
            android:title="@string/snooze_duration_title"
            android:defaultValue="10"/>
@@ -62,7 +62,7 @@
            android:key="volume_setting"
            android:title="@string/alarm_volume_title" />

        <com.android.deskclock.CrescendoLengthDialog
        <com.android.deskclock.settings.CrescendoLengthDialog
            android:key="alarm_crescendo_duration"
            android:title="@string/crescendo_duration_title"
            android:defaultValue="0"/>
@@ -85,12 +85,12 @@

    <PreferenceCategory
        android:title="@string/timer_settings">
        <RingtonePreference
        <com.android.deskclock.settings.TimerRingtonePreference
            android:key="timer_ringtone"
            android:title="@string/timer_ringtone_title"
            android:ringtoneType="alarm" />

        <com.android.deskclock.CrescendoLengthDialog
        <com.android.deskclock.settings.CrescendoLengthDialog
            android:key="timer_crescendo_duration"
            android:title="@string/crescendo_duration_title"
            android:defaultValue="0"/>
Loading