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

Commit c8f715a4 authored by Annie Chin's avatar Annie Chin
Browse files

Pop a toast when an alarm is predismissed from the AlarmClockFragment. 

Bug: 23345016

Toast/talkback reads the message "<alarm time> alarm dismissed.

Change-Id: I2cc6ee54238c86402ad252c8ada198f6d95e634c
parent f8ed8c08

src/com/android/deskclock/alarms/AlarmTimeClickHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ public final class AlarmTimeClickHandler { 
                context, AlarmStateManager.ALARM_DISMISS_TAG, alarmInstance,

                AlarmInstance.PREDISMISSED_STATE);

        context.sendBroadcast(dismissIntent);

        // TODO: pop toast that alarm has been dismissed

        mAlarmUpdateHandler.showPredismissToast(alarmInstance);

    }



    public void onRingtoneClicked(Alarm alarm) {

src/com/android/deskclock/alarms/AlarmUpdateHandler.java

+17 −0
Original line number Diff line number Diff line
@@ -19,12 +19,15 @@ package com.android.deskclock.alarms; 
import android.content.ContentResolver;

import android.content.Context;

import android.os.AsyncTask;

import android.text.format.DateFormat;

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewGroup;

import android.widget.Toast;



import com.android.deskclock.AlarmUtils;

import com.android.deskclock.R;

import com.android.deskclock.ToastMaster;

import com.android.deskclock.events.Events;

import com.android.deskclock.provider.Alarm;

import com.android.deskclock.provider.AlarmInstance;
@@ -171,6 +174,20 @@ public final class AlarmUpdateHandler implements View.OnTouchListener { 
        deleteTask.execute();

    }



    /**

     * Show a toast when an alarm is predismissed.

     *

     * @param instance Instance being predismissed.

     */

    public void showPredismissToast(AlarmInstance instance) {

        final String time = DateFormat.getTimeFormat(mAppContext).format(

                instance.getAlarmTime().getTime());

        final String text = mAppContext.getString(R.string.alarm_is_dismissed, time);

        Toast toast = Toast.makeText(mAppContext, text, Toast.LENGTH_LONG);

        ToastMaster.setToast(toast);

        toast.show();

    }



    /**

     * Hides any undo toast.

     */