Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not... (80ce3d87) · Commits · e / os / android_frameworks_base

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

+45 −39

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.SystemClock;
		import android.provider.Settings;
		import android.text.TextUtils;
		import android.util.Property;
		import android.util.Slog;
		import android.view.Display;
		@@ -71,6 +72,7 @@ import com.android.internal.os.SomeArgs;
		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.Comparator;
		import java.util.Locale;

		/**
		* This class handles the screen magnification when accessibility is enabled.
		@@ -1000,7 +1002,7 @@ public final class ScreenMagnifier implements EventStreamTransformation {
		mViewport.recomputeBounds(mMagnificationController.isMagnifying());
		} break;
		}
		} else {
		}
		switch (transition) {
		case WindowManagerPolicy.TRANSIT_ENTER:
		case WindowManagerPolicy.TRANSIT_SHOW: {
		@@ -1040,7 +1042,6 @@ public final class ScreenMagnifier implements EventStreamTransformation {
		} break;
		}
		}
		}
		} finally {
		if (info != null) {
		info.recycle();
		@@ -1067,7 +1068,12 @@ public final class ScreenMagnifier implements EventStreamTransformation {
		final float scrollX;
		final float scrollY;
		if (rectangle.width() > magnifiedRegionBounds.width()) {
		final int direction = TextUtils.getLayoutDirectionFromLocale(Locale.getDefault());
		if (direction == View.LAYOUT_DIRECTION_LTR) {
		scrollX = rectangle.left - magnifiedRegionBounds.left;
		} else {
		scrollX = rectangle.right - magnifiedRegionBounds.right;
		}
		} else if (rectangle.left < magnifiedRegionBounds.left) {
		scrollX = rectangle.left - magnifiedRegionBounds.left;
		} else if (rectangle.right > magnifiedRegionBounds.right) {