diff options
| author | 2013-09-09 17:36:48 +0000 | |
|---|---|---|
| committer | 2013-09-09 17:36:48 +0000 | |
| commit | bbddd49d6dc1b72dc81d4bb0033dea578066853e (patch) | |
| tree | 8454cac61fa8a78fb356c0a60b8d903bf43d185e | |
| parent | b44ab9872a0b6d325a38c79dfcae81ff5fc8622e (diff) | |
| parent | 183e2a351daa8071be69eacb514b9405193a7a35 (diff) | |
Merge "Propagate pivot values of 0 to native layer" into klp-dev
| -rw-r--r-- | core/java/android/view/View.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 8616aba39f71..650d6989bb49 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -9546,9 +9546,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, */ public void setPivotX(float pivotX) { ensureTransformationInfo(); - mPrivateFlags |= PFLAG_PIVOT_EXPLICITLY_SET; final TransformationInfo info = mTransformationInfo; - if (info.mPivotX != pivotX) { + boolean pivotSet = (mPrivateFlags & PFLAG_PIVOT_EXPLICITLY_SET) == + PFLAG_PIVOT_EXPLICITLY_SET; + if (info.mPivotX != pivotX || !pivotSet) { + mPrivateFlags |= PFLAG_PIVOT_EXPLICITLY_SET; invalidateViewProperty(true, false); info.mPivotX = pivotX; info.mMatrixDirty = true; @@ -9596,9 +9598,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, */ public void setPivotY(float pivotY) { ensureTransformationInfo(); - mPrivateFlags |= PFLAG_PIVOT_EXPLICITLY_SET; final TransformationInfo info = mTransformationInfo; - if (info.mPivotY != pivotY) { + boolean pivotSet = (mPrivateFlags & PFLAG_PIVOT_EXPLICITLY_SET) == + PFLAG_PIVOT_EXPLICITLY_SET; + if (info.mPivotY != pivotY || !pivotSet) { + mPrivateFlags |= PFLAG_PIVOT_EXPLICITLY_SET; invalidateViewProperty(true, false); info.mPivotY = pivotY; info.mMatrixDirty = true; |