From add52a975aa78d9e24d3e63a8168c00a9bfb80ec Mon Sep 17 00:00:00 2001
From: Svetoslav Ganov <svetoslavganov@google.com>
Date: Sun, 9 Sep 2012 11:13:53 -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: I8f3339f31310448ec8742f3101c1fdc61a6a5f83
---
 .../java/com/android/server/accessibility/ScreenMagnifier.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/java/com/android/server/accessibility/ScreenMagnifier.java b/services/java/com/android/server/accessibility/ScreenMagnifier.java
index de72211b22308..f33517b8d210c 100644
--- a/services/java/com/android/server/accessibility/ScreenMagnifier.java
+++ b/services/java/com/android/server/accessibility/ScreenMagnifier.java
@@ -245,6 +245,7 @@ public final class ScreenMagnifier implements EventStreamTransformation {
     public void onDestroy() {
         mMagnificationController.setScaleAndMagnifiedRegionCenter(1.0f,
                 0, 0, true);
+        mViewport.setFrameShown(false, true);
         mDisplayProvider.destroy();
         mDisplayContentObserver.destroy();
     }