Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '5b1720e11d3d5a23c4b0406e1c51e8cd8275f25f':
  Viewport should zoom out when screen magnification is disabled.
This commit is contained in:
Svetoslav Ganov
2012-09-09 10:53:27 -07:00
committed by Android Git Automerger
parent fbb2da7a4d 5b1720e11d
commit fb9d384f55
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/accessibility/ScreenMagnifier.java
View File

@@ -236,7 +236,6 @@ public final class ScreenMagnifier implements EventStreamTransformation {
mDetectingStateHandler.clear(); mDetectingStateHandler.clear();
mStateViewportDraggingHandler.clear(); mStateViewportDraggingHandler.clear();
mGestureDetector.clear(); mGestureDetector.clear();
if (mNext != null) { if (mNext != null) {
mNext.clear(); mNext.clear();
} }
@@ -244,6 +243,8 @@ public final class ScreenMagnifier implements EventStreamTransformation {
@Override @Override
public void onDestroy() { public void onDestroy() {
mMagnificationController.setScaleAndMagnifiedRegionCenter(1.0f,
0, 0, true);
mDisplayProvider.destroy(); mDisplayProvider.destroy();
mDisplayContentObserver.destroy(); mDisplayContentObserver.destroy();
} }