summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Casey <mrcasey@google.com> 2021-02-10 13:35:43 -0500
committer Matt Casey <mrcasey@google.com> 2021-02-10 13:35:43 -0500
commitc28d5919043afcd448be823d304a5f7c15190464 (patch)
tree3ea4cdd34f9fca9253bed640c5fa76b280a80b08
parentbf03ae3b78e69f6260f05033883d3911b33a4e8c (diff)
Make magnifier show up opposite touch
Touch on left -> magnifier on right, touch on right -> magnifier on left. No dynamic switching for now, just affecting initial placement. Bug: 179499370 Test: Bring up crop UI, drag handles on the left and right, observe magnifier doesn't show up beneath thumb. Change-Id: Ib020b99fec41637bce4e1797412afbdbd9447ab2
-rw-r--r--packages/SystemUI/src/com/android/systemui/screenshot/MagnifierView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/MagnifierView.java b/packages/SystemUI/src/com/android/systemui/screenshot/MagnifierView.java
index f88715164bc7..f8f1d3ac9a5b 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/MagnifierView.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/MagnifierView.java
@@ -144,7 +144,9 @@ public class MagnifierView extends View implements CropView.CropInteractionListe
setAlpha(0f);
setTranslationX((getParentWidth() - getWidth()) / 2);
setVisibility(View.VISIBLE);
- animate().alpha(1f).translationX(0).scaleX(1f).scaleY(1f).start();
+ boolean touchOnRight = event.getX() > getParentWidth() / 2;
+ float translateXTarget = touchOnRight ? 0 : getParentWidth() - getWidth();
+ animate().alpha(1f).translationX(translateXTarget).scaleX(1f).scaleY(1f).start();
break;
case MotionEvent.ACTION_MOVE:
mLastCropPosition = cropPosition;