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

Commit 5b1720e1 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Viewport should zoom out when screen magnification is disabled." into jb-mr1-dev

parents a3909a93 6d0df874

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

+2 −1
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ public final class ScreenMagnifier implements EventStreamTransformation { 
        mDetectingStateHandler.clear();

        mStateViewportDraggingHandler.clear();

        mGestureDetector.clear();



        if (mNext != null) {

            mNext.clear();

        }
@@ -244,6 +243,8 @@ public final class ScreenMagnifier implements EventStreamTransformation { 


    @Override

    public void onDestroy() {

        mMagnificationController.setScaleAndMagnifiedRegionCenter(1.0f,

                0, 0, true);

        mDisplayProvider.destroy();

        mDisplayContentObserver.destroy();

    }