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

Commit 300d1c72 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix a11y announcements for snoozing" into udc-dev am: 4ad574ae am: 74ede1ff"

parents 58c66828 61f722d1

packages/SystemUI/res/layout/notification_snooze.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ 
            android:layout_toEndOf="@+id/snooze_option_default"

            android:layout_toEndOf="@+id/snooze_option_default"

            android:layout_centerVertical="true"

            android:layout_centerVertical="true"

            android:paddingTop="1dp"

            android:paddingTop="1dp"

            android:importantForAccessibility="yes"

            android:tint="#9E9E9E" />

            android:tint="#9E9E9E" />





        <TextView

        <TextView

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationSnooze.java

+5 −0
Original line number Original line 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

        int drawableId = show ? com.android.internal.R.drawable.ic_collapse_notification

                : com.android.internal.R.drawable.ic_expand_notification;

                : com.android.internal.R.drawable.ic_expand_notification;

        mExpandButton.setImageResource(drawableId);

        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) {

        if (mExpanded != show) {

            mExpanded = show;

            mExpanded = show;

            animateSnoozeOptions(show);

            animateSnoozeOptions(show);
@@ -373,6 +376,7 @@ public class NotificationSnooze extends LinearLayout 
        } else if (id == R.id.notification_snooze) {

        } else if (id == R.id.notification_snooze) {

            // Toggle snooze options

            // Toggle snooze options

            showSnoozeOptions(!mExpanded);

            showSnoozeOptions(!mExpanded);

            mSnoozeView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);

            mMetricsLogger.write(!mExpanded ? OPTIONS_OPEN_LOG : OPTIONS_CLOSE_LOG);

            mMetricsLogger.write(!mExpanded ? OPTIONS_OPEN_LOG : OPTIONS_CLOSE_LOG);

        } else {

        } else {

            // Undo snooze was selected

            // Undo snooze was selected
@@ -401,6 +405,7 @@ public class NotificationSnooze extends LinearLayout 
    public View getContentView() {

    public View getContentView() {

        // Reset the view before use

        // Reset the view before use

        setSelected(mDefaultOption, false);

        setSelected(mDefaultOption, false);

        showSnoozeOptions(false);

        return this;

        return this;

    }

    }