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

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

Alarm content description now includes either existing label or "Alarm." 

Bug: 24066025

Previous content description was just the alarm time.

Change-Id: Ibdd40aac04515a71da109b65716f8d909ed76fac
parent cb8d2b9b

src/com/android/deskclock/alarms/dataadapter/CollapsedAlarmViewHolder.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -88,7 +88,8 @@ public final class CollapsedAlarmViewHolder extends AlarmTimeViewHolder { 
        boolean boundPreemptiveDismiss =

        boolean boundPreemptiveDismiss =

                bindPreemptiveDismissButton(context, alarm, alarmInstance);

                bindPreemptiveDismissButton(context, alarm, alarmInstance);

        hairLine.setVisibility(boundPreemptiveDismiss ? View.GONE : View.VISIBLE);

        hairLine.setVisibility(boundPreemptiveDismiss ? View.GONE : View.VISIBLE);

        itemView.setContentDescription(clock.getContentDescription());

        itemView.setContentDescription(clock.getContentDescription() + " " +

                alarm.getLabelOrDefault(context));

    }

    }





    private void bindReadOnlyLabel(Context context, Alarm alarm) {

    private void bindReadOnlyLabel(Context context, Alarm alarm) {

src/com/android/deskclock/provider/Alarm.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ import android.net.Uri; 
import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;





import com.android.deskclock.R;

import com.android.deskclock.data.DataModel;

import com.android.deskclock.data.DataModel;





import java.util.Calendar;

import java.util.Calendar;
@@ -306,6 +307,10 @@ public final class Alarm implements Parcelable, ClockContract.AlarmsColumns { 
        deleteAfterUse = p.readInt() == 1;

        deleteAfterUse = p.readInt() == 1;

    }

    }





    public String getLabelOrDefault(Context context) {

        return label.isEmpty() ? context.getString(R.string.default_label) : label;

    }



    /**

    /**

     * Whether the alarm is in a state to show preemptive dismiss. Valid states are SNOOZE_STATE

     * Whether the alarm is in a state to show preemptive dismiss. Valid states are SNOOZE_STATE

     * HIGH_NOTIFICATION, LOW_NOTIFICATION, and HIDE_NOTIFICATION.

     * HIGH_NOTIFICATION, LOW_NOTIFICATION, and HIDE_NOTIFICATION.