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

Commit cf04021a authored by Annie Chin's avatar Annie Chin Committed by Android (Google) Code Review
Browse files

Merge "Allow "Silent" to be set as a Timer ringtone." into ub-deskclock-charm

parents 8532be04 32efff25

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ 
    <!-- Title of default ringtone played when a timer expires. -->

    <string name="default_timer_ringtone_title">Timer Expired</string>



    <!-- Title of silent ringtone played when a timer expires. -->

    <string name="silent_timer_ringtone_title">Silent</string>



    <!-- Label on expanded alarm edit view. -->

    <string name="ringtone">Ringtone</string>

src/com/android/deskclock/data/TimerModel.java

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.preference.PreferenceManager; 


import com.android.deskclock.R;

import com.android.deskclock.settings.SettingsActivity;

import com.android.deskclock.settings.TimerRingtonePreference;



/**

 * All timer data will eventually be accessed via this model.
@@ -77,6 +78,9 @@ final class TimerModel { 


            if (defaultUri.equals(uri)) {

                mTimerRingtoneTitle = mContext.getString(R.string.default_timer_ringtone_title);

            } else if (TimerRingtonePreference.NO_RINGTONE_URI.equals(uri)) {

                // Special case: no ringtone has a title of "Silent".

                mTimerRingtoneTitle = mContext.getString(R.string.silent_timer_ringtone_title);

            } else {

                final Ringtone ringtone = RingtoneManager.getRingtone(mContext, uri);

                mTimerRingtoneTitle = ringtone.getTitle(mContext);

src/com/android/deskclock/settings/TimerRingtonePreference.java

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.deskclock.settings; 
import android.content.Context;

import android.content.Intent;

import android.media.RingtoneManager;

import android.net.Uri;

import android.preference.RingtonePreference;

import android.support.annotation.NonNull;

import android.util.AttributeSet;
@@ -29,6 +30,7 @@ import com.android.deskclock.data.DataModel; 
 * behind the default selection.

 */

public final class TimerRingtonePreference extends RingtonePreference {

    public static final Uri NO_RINGTONE_URI = Uri.EMPTY;



    public TimerRingtonePreference(Context context) {

        super(context);
@@ -54,5 +56,8 @@ public final class TimerRingtonePreference extends RingtonePreference { 
        // Replace the default ringtone uri with the beeping ringtone for timers.

        ringtonePickerIntent.putExtra(RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI,

                DataModel.getDataModel().getDefaultTimerRingtoneUri());



        // Add a "None" option. If selected, the value of the preference will be NO_RINGTONE_URI.

        ringtonePickerIntent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true);

    }

}
 
 No newline at end of file

src/com/android/deskclock/timer/TimerKlaxon.java

+7 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.deskclock.AsyncRingtonePlayer; 
import com.android.deskclock.LogUtils;

import com.android.deskclock.data.DataModel;

import com.android.deskclock.settings.SettingsActivity;

import com.android.deskclock.settings.TimerRingtonePreference;



public abstract class TimerKlaxon {
@@ -47,8 +48,12 @@ public abstract class TimerKlaxon { 


        // Look up user-selected timer ringtone.

        final Uri uri = DataModel.getDataModel().getTimerRingtoneUri();

        if (uri.equals(TimerRingtonePreference.NO_RINGTONE_URI)) {

            // Special case: Silent ringtone

            LogUtils.i("Playing silent ringtone");

        } else {

            getAsyncRingtonePlayer(context).play(uri);



        }

        sStarted = true;

    }