From b6c3b20d7150f725d638c620affd521145fe8f90 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Wed, 6 Nov 2013 09:35:07 -0500 Subject: [PATCH] Fix lockscreen camera preview position in RTL. Bug:11263914 Change-Id: Ic3e5157ceb82495d10afd74b3af2655434a9467c --- .../Keyguard/src/com/android/keyguard/CameraWidgetFrame.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/Keyguard/src/com/android/keyguard/CameraWidgetFrame.java b/packages/Keyguard/src/com/android/keyguard/CameraWidgetFrame.java index 7d1f24f4963e8..3dc4d5c4c3651 100644 --- a/packages/Keyguard/src/com/android/keyguard/CameraWidgetFrame.java +++ b/packages/Keyguard/src/com/android/keyguard/CameraWidgetFrame.java @@ -243,11 +243,12 @@ public class CameraWidgetFrame extends KeyguardWidgetFrame implements View.OnCli final float pvTransX = pvWidth < thisWidth ? (thisWidth - pvWidth) / 2 : 0; final float pvTransY = pvHeight < thisHeight ? (thisHeight - pvHeight) / 2 : 0; - mPreview.setPivotX(0); + final boolean isRtl = mPreview.getLayoutDirection() == LAYOUT_DIRECTION_RTL; + mPreview.setPivotX(isRtl ? mPreview.width : 0); mPreview.setPivotY(0); mPreview.setScaleX(pvScale); mPreview.setScaleY(pvScale); - mPreview.setTranslationX(pvTransX); + mPreview.setTranslationX((isRtl ? -1 : 1) * pvTransX); mPreview.setTranslationY(pvTransY); mRenderedSize.set(width, height);