Merge "Remove clipboard_announce_live_region flag" into main (32a0da13) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -670,16 +670,6 @@ flag {
		bug: "425471100"
		}

		flag {
		name: "clipboard_announce_live_region"
		namespace: "systemui"
		description: "Use live region for clipboard status announcement"
		bug: "378856296"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "screen_reactions"
		namespace: "systemui"

+2 −15

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.systemui.clipboardoverlay;
		import static android.content.Intent.ACTION_CLOSE_SYSTEM_DIALOGS;

		import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.CLIPBOARD_OVERLAY_SHOW_ACTIONS;
		import static com.android.systemui.Flags.clipboardAnnounceLiveRegion;
		import static com.android.systemui.Flags.clipboardOverlayMultiuser;
		import static com.android.systemui.Flags.showClipboardIndication;
		import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ACTION_SHOWN;
		@@ -236,25 +235,13 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		mClipboardLogger.logUnguarded(CLIPBOARD_OVERLAY_SHOWN_MINIMIZED);
		mIsMinimized = true;
		mView.setMinimized(true);
		if (clipboardAnnounceLiveRegion()) {
		animateInWithAnnouncement(mClipboardModel.getType());
		} else {
		animateIn();
		}
		} else {
		mClipboardLogger.logUnguarded(CLIPBOARD_OVERLAY_SHOWN_EXPANDED);
		setExpandedView(() -> {
		if (clipboardAnnounceLiveRegion()) {
		animateInWithAnnouncement(mClipboardModel.getType());
		} else {
		animateIn();
		}
		});
		}
		if (!clipboardAnnounceLiveRegion()) {
		mWindow.withWindowAttached(() -> mView.announceForAccessibility(
		getAccessibilityAnnouncement(mClipboardModel.getType())));
		}
		} else if (!mIsMinimized) {
		setExpandedView(() -> {
		});