From 6d0df874ce235872bd5fdd4d3bce0905869a099d Mon Sep 17 00:00:00 2001
From: Svetoslav Ganov <svetoslavganov@google.com>
Date: Sun, 9 Sep 2012 10:46:07 -0700
Subject: [PATCH] Viewport should zoom out when screen magnification is
 disabled.

1. If screen magnification is disabled when the screen is in a
   magnified state we have to zoom out since otherwise the user
   is stuck in a magnified state without ability to pan/zoom/
   toggle magnification which renders the device useless.

bug:7131030

Change-Id: Ia620954fbd594e7cd470e43b89d9ed04c0397c3c
---
 .../java/com/android/server/accessibility/ScreenMagnifier.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/accessibility/ScreenMagnifier.java b/services/java/com/android/server/accessibility/ScreenMagnifier.java
index bd7f276f7f482..b23dcfd525b54 100644
--- 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();
     }