Merge "Make system dialogs' a11y events like Activity's" into pi-dev (326ab68a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -1380,6 +1380,15 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		mHardwareLayout = HardwareUiLayout.get(mListView);
		mHardwareLayout.setOutsideTouchListener(view -> dismiss());
		setTitle(R.string.global_actions);
		mListView.setAccessibilityDelegate(new View.AccessibilityDelegate() {
		@Override
		public boolean dispatchPopulateAccessibilityEvent(
		View host, AccessibilityEvent event) {
		// Populate the title here, just as Activity does
		event.getText().add(mContext.getString(R.string.global_actions));
		return true;
		}
		});
		}

		private void updateList() {

+12 −2

Original line number	Diff line number	Diff line
		@@ -742,8 +742,11 @@ public class VolumeDialogImpl implements VolumeDialog {
		updateVolumeRowH(row);
		}
		updateRingerH();
		mWindow.setTitle(mContext.getString(R.string.volume_dialog_title,
		getStreamLabelH(getActiveRow().ss)));
		mWindow.setTitle(composeWindowTitle());
		}

		CharSequence composeWindowTitle() {
		return mContext.getString(R.string.volume_dialog_title, getStreamLabelH(getActiveRow().ss));
		}

		private void updateVolumeRowH(VolumeRow row) {
		@@ -1213,6 +1216,13 @@ public class VolumeDialogImpl implements VolumeDialog {
		mAccessibilityMgr.removeCallback(mListener);
		}

		@Override
		public boolean dispatchPopulateAccessibilityEvent(View host, AccessibilityEvent event) {
		// Activities populate their title here. Follow that example.
		event.getText().add(composeWindowTitle());
		return true;
		}

		@Override
		public boolean onRequestSendAccessibilityEvent(ViewGroup host, View child,
		AccessibilityEvent event) {