Merge "Merge "Fix a11y announcements for snoozing" into udc-dev am: 4ad574ae86 am: 74ede1ff9e" (300d1c72) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/notification_snooze.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@
		android:layout_toEndOf="@+id/snooze_option_default"
		android:layout_centerVertical="true"
		android:paddingTop="1dp"
		android:importantForAccessibility="yes"
		android:tint="#9E9E9E" />

		<TextView

+5 −0

Original line number	Diff line number	Diff line
		@@ -290,6 +290,9 @@ public class NotificationSnooze extends LinearLayout
		int drawableId = show ? com.android.internal.R.drawable.ic_collapse_notification
		: com.android.internal.R.drawable.ic_expand_notification;
		mExpandButton.setImageResource(drawableId);
		mExpandButton.setContentDescription(mContext.getString(show
		? com.android.internal.R.string.expand_button_content_description_expanded
		: com.android.internal.R.string.expand_button_content_description_collapsed));
		if (mExpanded != show) {
		mExpanded = show;
		animateSnoozeOptions(show);
		@@ -373,6 +376,7 @@ public class NotificationSnooze extends LinearLayout
		} else if (id == R.id.notification_snooze) {
		// Toggle snooze options
		showSnoozeOptions(!mExpanded);
		mSnoozeView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
		mMetricsLogger.write(!mExpanded ? OPTIONS_OPEN_LOG : OPTIONS_CLOSE_LOG);
		} else {
		// Undo snooze was selected
		@@ -401,6 +405,7 @@ public class NotificationSnooze extends LinearLayout
		public View getContentView() {
		// Reset the view before use
		setSelected(mDefaultOption, false);
		showSnoozeOptions(false);
		return this;
		}