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

2012-09-09 10:50:34 -07:00
parent a3909a9395 6d0df874ce
commit 5b1720e11d
1 changed files with 2 additions and 1 deletions
--- a/services/java/com/android/server/accessibility/ScreenMagnifier.java
+++ b/services/java/com/android/server/accessibility/ScreenMagnifier.java
@@ -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();
    }