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

Commit 3ac98445 authored by Daniel Norman's avatar Daniel Norman
Browse files

Rename mag shortcut method to notifyMagnificationShortcutTriggered. 

The old name was imprecise and incorrect (it was used for more than just
button shortcut).

Bug: n/a
Test: n/a (mechanical refactor)
Flag: n/a (mechanical refactor)
Change-Id: I6422c1f165dde49cb1797334c105d49eb4a8a09e
parent ab5ee287

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) {

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

+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);