commit 5b1720e11d3d5a23c4b0406e1c51e8cd8275f25f
author Svetoslav Ganov <svetoslavganov@google.com> Sun Sep 09 10:50:34 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Sep 09 10:50:34 2012 -0700
tree 77ebbbfddcd50d7e1b222573a2ff416d6488e5dc
parent a3909a93958676d341424d574752bc7b3280d421
parent 6d0df874ce235872bd5fdd4d3bce0905869a099d

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

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

diff --git a/services/java/com/android/server/accessibility/ScreenMagnifier.java b/services/java/com/android/server/accessibility/ScreenMagnifier.java
index 78092dd..de72211 100644
--- a/services/java/com/android/server/accessibility/ScreenMagnifier.java
+++ b/services/java/com/android/server/accessibility/ScreenMagnifier.java
@@ -236,7 +236,6 @@
         mDetectingStateHandler.clear();
         mStateViewportDraggingHandler.clear();
         mGestureDetector.clear();
-
         if (mNext != null) {
             mNext.clear();
         }
@@ -244,6 +243,8 @@
 
     @Override
     public void onDestroy() {
+        mMagnificationController.setScaleAndMagnifiedRegionCenter(1.0f,
+                0, 0, true);
         mDisplayProvider.destroy();
         mDisplayContentObserver.destroy();
     }