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

am 20dc4923: am 10b9ac80: Merge "Fix lockscreen camera preview position in RTL." into klp-dev

Browse Source 
* commit '20dc49235e213d40f75dca9005e0e248931ceff4':
  Fix lockscreen camera preview position in RTL.
This commit is contained in:
John Spurlock
2013-11-06 13:55:18 -08:00
committed by Android Git Automerger
parent 5a31605a03 20dc49235e
commit cd6258b50f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/Keyguard/src/com/android/keyguard/CameraWidgetFrame.java
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 pvTransX = pvWidth < thisWidth ? (thisWidth - pvWidth) / 2 : 0;
final float pvTransY = pvHeight < thisHeight ? (thisHeight - pvHeight) / 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.setPivotY(0);
mPreview.setScaleX(pvScale); mPreview.setScaleX(pvScale);
mPreview.setScaleY(pvScale); mPreview.setScaleY(pvScale);
mPreview.setTranslationX(pvTransX); mPreview.setTranslationX((isRtl ? -1 : 1) * pvTransX);
mPreview.setTranslationY(pvTransY); mPreview.setTranslationY(pvTransY);
mRenderedSize.set(width, height); mRenderedSize.set(width, height);