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

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

Merge "Add contentdescription for Alarm on/off switch." into ub-deskclock-dazzle

parents dc83a763 3d362ef4

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -54,6 +54,12 @@ 
    <!-- Setting label on Set alarm screen: Label -->

    <string name="label">Label</string>



    <!-- Content description for alarm on/off switch in On state -->

    <string name="on_switch">On</string>



    <!-- Content description for alarm on/off switch in Off state -->

    <string name="off_switch">Off</string>



    <!-- Default label to display for an alarm -->

    <string name="default_label">Alarm</string>

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

+4 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.deskclock.alarms.dataadapter; 


import android.content.Context;

import android.support.v7.widget.RecyclerView;

import android.support.v7.widget.SwitchCompat;

import android.view.View;

import android.widget.CompoundButton;

import android.widget.TextView;
@@ -86,8 +87,10 @@ public abstract class AlarmTimeViewHolder extends RecyclerView.ViewHolder { 
     */

    public abstract void bindAlarm(Context context, Alarm alarm, AlarmInstance alarmInstance);



    protected void bindOnOffSwitch(Alarm alarm) {

    protected void bindOnOffSwitch(Context context, Alarm alarm) {

        onoff.setChecked(alarm.enabled);

        ((SwitchCompat) onoff).setTextOn(context.getString(R.string.on_switch));

        ((SwitchCompat) onoff).setTextOff(context.getString(R.string.off_switch));

    }



    protected void bindClock(Context context, Alarm alarm) {

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

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public final class CollapsedAlarmViewHolder extends AlarmTimeViewHolder { 
    @Override

    public void bindAlarm(Context context, Alarm alarm, AlarmInstance alarmInstance) {

        setData(alarm, alarmInstance);

        bindOnOffSwitch(alarm);

        bindOnOffSwitch(context, alarm);

        bindClock(context, alarm);

        bindRepeatText(context, alarm);

        bindReadOnlyLabel(context, alarm);

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

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ public final class ExpandedAlarmViewHolder extends AlarmTimeViewHolder { 
    @Override

    public void bindAlarm(Context context, Alarm alarm, AlarmInstance alarmInstance) {

        setData(alarm, alarmInstance);

        bindOnOffSwitch(alarm);

        bindOnOffSwitch(context, alarm);

        bindClock(context, alarm);

        bindEditLabel(alarm);

        bindDaysOfWeekButtons(alarm);