Merge "Fix lockscreen camera preview position in RTL." into klp-dev

This commit is contained in:
John Spurlock
2013-11-06 21:48:41 +00:00
committed by Android (Google) Code Review

View File

@@ -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);