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

Commit 7a3e91f4 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am 467a052e: Magnification does not work if no enabled accessibility services. 

* commit '467a052e':
  Magnification does not work if no enabled accessibility services.
parents b71ec91a 467a052e

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

+5 −2
Original line number Diff line number Diff line
@@ -1160,7 +1160,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
        boolean setInputFilter = false;

        AccessibilityInputFilter inputFilter = null;

        synchronized (mLock) {

            if (userState.mIsAccessibilityEnabled) {

            // Accessibility enabled means at least one service is enabled.

            if (userState.mIsAccessibilityEnabled

                    || userState.mIsDisplayMagnificationEnabled) {

                if (!mHasInputFilter) {

                    mHasInputFilter = true;

                    if (mInputFilter == null) {
@@ -1174,7 +1176,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
                if (userState.mIsDisplayMagnificationEnabled) {

                    flags |= AccessibilityInputFilter.FLAG_FEATURE_SCREEN_MAGNIFIER;

                }

                if (userState.mIsTouchExplorationEnabled) {

                // Touch exploration without accessibility makes no sense.

                if (userState.mIsAccessibilityEnabled && userState.mIsTouchExplorationEnabled) {

                    flags |= AccessibilityInputFilter.FLAG_FEATURE_TOUCH_EXPLORATION;

                }

                mInputFilter.setEnabledFeatures(flags);