PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a11y issues in the schedule editor" into main

Browse Source
This commit is contained in:
Matías Hernández
2024-07-29 23:29:26 +00:00
committed by Android (Google) Code Review
parent 149bd0a5a4 a463b0af7b
commit 50a18d9e85
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/modes_set_schedule_layout.xml
View File

@@ -48,7 +48,8 @@
app:layout_constrainedWidth="true"
app:layout_constraintHorizontal_bias="0"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Medium"
android:text="@string/zen_mode_start_time" />
android:text="@string/zen_mode_start_time"
android:importantForAccessibility="no" />
<!-- Start time display + setter -->
<TextView
@@ -85,7 +86,8 @@
app:layout_constrainedWidth="true"
app:layout_constraintHorizontal_bias="0"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Medium"
android:text="@string/zen_mode_end_time" />
android:text="@string/zen_mode_end_time"
android:importantForAccessibility="no" />
<!-- End time setter; right-aligned -->
<TextView

15
src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceController.java
View File

@@ -67,12 +67,18 @@ class ZenModeSetSchedulePreferenceController extends AbstractZenModePreferenceCo
LayoutPreference layoutPref = (LayoutPreference) preference;
TextView start = layoutPref.findViewById(R.id.start_time);
start.setText(timeString(mSchedule.startHour, mSchedule.startMinute));
String startTimeString = timeString(mSchedule.startHour, mSchedule.startMinute);
start.setText(startTimeString);
start.setContentDescription(
mContext.getString(R.string.zen_mode_start_time) + "\n" + startTimeString);
start.setOnClickListener(
timePickerLauncher(mSchedule.startHour, mSchedule.startMinute, mStartSetter));
TextView end = layoutPref.findViewById(R.id.end_time);
end.setText(timeString(mSchedule.endHour, mSchedule.endMinute));
String endTimeString = timeString(mSchedule.endHour, mSchedule.endMinute);
end.setText(endTimeString);
end.setContentDescription(
mContext.getString(R.string.zen_mode_end_time) + "\n" + endTimeString);
end.setOnClickListener(
timePickerLauncher(mSchedule.endHour, mSchedule.endMinute, mEndSetter));
@@ -198,7 +204,10 @@ class ZenModeSetSchedulePreferenceController extends AbstractZenModePreferenceCo
// day label.
dayToggle.setTextOn(mShortDayFormat.format(c.getTime()));
dayToggle.setTextOff(mShortDayFormat.format(c.getTime()));
dayToggle.setContentDescription(mLongDayFormat.format(c.getTime()));
String state = dayEnabled
? mContext.getString(com.android.internal.R.string.capital_on)
: mContext.getString(com.android.internal.R.string.capital_off);
dayToggle.setStateDescription(mLongDayFormat.format(c.getTime()) + ", " + state);
dayToggle.setChecked(dayEnabled);
dayToggle.setOnCheckedChangeListener((buttonView, isChecked) -> {