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

Author: sganov

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

@@ -236,14 +236,15 @@ public void clear() {
         mDetectingStateHandler.clear();
         mStateViewportDraggingHandler.clear();
         mGestureDetector.clear();
-
         if (mNext != null) {
             mNext.clear();
         }
     }
 
     @Override
     public void onDestroy() {
+        mMagnificationController.setScaleAndMagnifiedRegionCenter(1.0f,
+                0, 0, true);
         mDisplayProvider.destroy();
         mDisplayContentObserver.destroy();
     }