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

Commit f11da4c7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Notification history a11y fixes" into rvc-dev

parents 0ff0929e 4922aa00

src/com/android/settings/notification/history/NotificationHistoryActivity.java

+12 −10
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.settings.notification.history; 


import static android.provider.Settings.Secure.NOTIFICATION_HISTORY_ENABLED;



import static androidx.core.view.accessibility.AccessibilityEventCompat.TYPE_VIEW_ACCESSIBILITY_FOCUSED;



import android.app.Activity;

import android.app.ActivityManager;

import android.app.INotificationManager;
@@ -97,7 +99,7 @@ public class NotificationHistoryActivity extends Activity { 
                expand.setContentDescription(container.getVisibility() == View.VISIBLE

                        ? getString(R.string.condition_expand_hide)

                        : getString(R.string.condition_expand_show));

                    expand.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);

                expand.sendAccessibilityEvent(TYPE_VIEW_ACCESSIBILITY_FOCUSED);

            });



            TextView label = viewForPackage.findViewById(R.id.label);
@@ -109,7 +111,7 @@ public class NotificationHistoryActivity extends Activity { 
            count.setText(getResources().getQuantityString(R.plurals.notification_history_count,

                    nhp.notifications.size(), nhp.notifications.size()));



            NotificationHistoryRecyclerView rv =

            final NotificationHistoryRecyclerView rv =

                    viewForPackage.findViewById(R.id.notification_list);

            rv.setAdapter(new NotificationHistoryAdapter(mNm, rv));

            ((NotificationHistoryAdapter) rv.getAdapter()).onRebuildComplete(

src/com/android/settings/notification/history/NotificationHistoryAdapter.java

+2 −1
Original line number Diff line number Diff line
@@ -91,11 +91,12 @@ public class NotificationHistoryAdapter extends 
                        new AccessibilityNodeInfo.AccessibilityAction(

                                AccessibilityNodeInfo.ACTION_CLICK, description);

                info.addAction(customClick);

                //info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_DISMISS);

                info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_DISMISS);

            }



            @Override

            public boolean performAccessibilityAction(View host, int action, Bundle args) {

                super.performAccessibilityAction(host, action, args);

                if (action == AccessibilityNodeInfo.AccessibilityAction.ACTION_DISMISS.getId()) {

                    onItemSwipeDeleted(position);

                    return true;