Merge "Rename mag shortcut method to notifyMagnificationShortcutTriggered." into main (26531ace) · Commits · e / os / android_frameworks_base

services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -610,7 +610,7 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo
		}
		}

		void notifyAccessibilityButtonClicked(int displayId) {
		void notifyMagnificationShortcutTriggered(int displayId) {
		if (mMagnificationGestureHandler.size() != 0) {
		final MagnificationGestureHandler handler = mMagnificationGestureHandler.get(displayId);
		if (handler != null) {

+3 −3

Original line number	Diff line number	Diff line
		@@ -2220,10 +2220,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
		}
		}

		private void sendAccessibilityButtonToInputFilter(int displayId) {
		private void notifyMagnificationShortcutTriggered(int displayId) {
		synchronized (mLock) {
		if (mHasInputFilter && mInputFilter != null) {
		mInputFilter.notifyAccessibilityButtonClicked(displayId);
		mInputFilter.notifyMagnificationShortcutTriggered(displayId);
		}
		}
		}
		@@ -3898,7 +3898,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
		.isActivated(displayId);
		logAccessibilityShortcutActivated(mContext, MAGNIFICATION_COMPONENT_NAME, shortcutType,
		enabled);
		sendAccessibilityButtonToInputFilter(displayId);
		notifyMagnificationShortcutTriggered(displayId);
		return;
		}
		final ComponentName targetComponentName = ComponentName.unflattenFromString(targetName);