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

Merge "Notification history a11y fixes" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-21 21:22:44 +00:00
committed by Android (Google) Code Review
parent 0ff0929e0f 4922aa006a
commit f11da4c787
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/notification/history/NotificationHistoryActivity.java
View File

@@ -18,6 +18,8 @@ package com.android.settings.notification.history;
import static android.provider.Settings.Secure.NOTIFICATION_HISTORY_ENABLED; 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.Activity;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.INotificationManager; import android.app.INotificationManager;
@@ -89,15 +91,15 @@ public class NotificationHistoryActivity extends Activity {
? getString(R.string.condition_expand_hide) ? getString(R.string.condition_expand_hide)
: getString(R.string.condition_expand_show)); : getString(R.string.condition_expand_show));
expand.setOnClickListener(v -> { expand.setOnClickListener(v -> {
container.setVisibility(container.getVisibility() == View.VISIBLE container.setVisibility(container.getVisibility() == View.VISIBLE
? View.GONE : View.VISIBLE); ? View.GONE : View.VISIBLE);
expand.setImageResource(container.getVisibility() == View.VISIBLE expand.setImageResource(container.getVisibility() == View.VISIBLE
? R.drawable.ic_expand_less ? R.drawable.ic_expand_less
: com.android.internal.R.drawable.ic_expand_more); : com.android.internal.R.drawable.ic_expand_more);
expand.setContentDescription(container.getVisibility() == View.VISIBLE expand.setContentDescription(container.getVisibility() == View.VISIBLE
? getString(R.string.condition_expand_hide) ? getString(R.string.condition_expand_hide)
: getString(R.string.condition_expand_show)); : 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); 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, count.setText(getResources().getQuantityString(R.plurals.notification_history_count,
nhp.notifications.size(), nhp.notifications.size())); nhp.notifications.size(), nhp.notifications.size()));
NotificationHistoryRecyclerView rv = final NotificationHistoryRecyclerView rv =
viewForPackage.findViewById(R.id.notification_list); viewForPackage.findViewById(R.id.notification_list);
rv.setAdapter(new NotificationHistoryAdapter(mNm, rv)); rv.setAdapter(new NotificationHistoryAdapter(mNm, rv));
((NotificationHistoryAdapter) rv.getAdapter()).onRebuildComplete( ((NotificationHistoryAdapter) rv.getAdapter()).onRebuildComplete(

3
src/com/android/settings/notification/history/NotificationHistoryAdapter.java
View File

@@ -91,11 +91,12 @@ public class NotificationHistoryAdapter extends
new AccessibilityNodeInfo.AccessibilityAction( new AccessibilityNodeInfo.AccessibilityAction(
AccessibilityNodeInfo.ACTION_CLICK, description); AccessibilityNodeInfo.ACTION_CLICK, description);
info.addAction(customClick); info.addAction(customClick);
//info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_DISMISS); info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_DISMISS);
} }
@Override @Override
public boolean performAccessibilityAction(View host, int action, Bundle args) { public boolean performAccessibilityAction(View host, int action, Bundle args) {
super.performAccessibilityAction(host, action, args);
if (action == AccessibilityNodeInfo.AccessibilityAction.ACTION_DISMISS.getId()) { if (action == AccessibilityNodeInfo.AccessibilityAction.ACTION_DISMISS.getId()) {
onItemSwipeDeleted(position); onItemSwipeDeleted(position);
return true; return true;