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

Commit 35662ba9 authored Jan 13, 2025 by Jean Chen Committed by Android (Google) Code Review Jan 13, 2025

Merge "Fix the TalkBack announces error panel visibility state" into main

parents 32b91a7a 7587c51b

packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java

+2 −5

Original line number	Original line	Diff line number	Diff line
	@@ -609,15 +609,12 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks
	final WindowMagnificationController windowMagnificationController =		final WindowMagnificationController windowMagnificationController =
	mWindowMagnificationControllerSupplier.get(displayId);		mWindowMagnificationControllerSupplier.get(displayId);
	if (windowMagnificationController != null) {		if (windowMagnificationController != null) {
	boolean isWindowMagnifierActivated = windowMagnificationController.isActivated();
	if (isWindowMagnifierActivated) {
	windowMagnificationController.updateDragHandleResourcesIfNeeded(shown);		windowMagnificationController.updateDragHandleResourcesIfNeeded(shown);
	}

	if (shown) {		if (shown) {
	mA11yLogger.logWithPosition(		mA11yLogger.logWithPosition(
	MagnificationSettingsEvent.MAGNIFICATION_SETTINGS_PANEL_OPENED,		MagnificationSettingsEvent.MAGNIFICATION_SETTINGS_PANEL_OPENED,
	isWindowMagnifierActivated		windowMagnificationController.isActivated()
	? ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW		? ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW
	: ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN		: ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN
	);		);

packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1519,12 +1519,12 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold
	}		}

	void updateDragHandleResourcesIfNeeded(boolean settingsPanelIsShown) {		void updateDragHandleResourcesIfNeeded(boolean settingsPanelIsShown) {
			mSettingsPanelVisibility = settingsPanelIsShown;

	if (!isActivated()) {		if (!isActivated()) {
	return;		return;
	}		}

	mSettingsPanelVisibility = settingsPanelIsShown;

	mDragView.setBackground(mContext.getResources().getDrawable(settingsPanelIsShown		mDragView.setBackground(mContext.getResources().getDrawable(settingsPanelIsShown
	? R.drawable.accessibility_window_magnification_drag_handle_background_change_inset		? R.drawable.accessibility_window_magnification_drag_handle_background_change_inset
	: R.drawable.accessibility_window_magnification_drag_handle_background_inset));		: R.drawable.accessibility_window_magnification_drag_handle_background_inset));