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

Commit c7186e20 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22257386



Change-Id: I7763d8c1d9917d17b49124074b8f6701f421b126
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents be7f7b74 4ad574ae

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

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

+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;

    }