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

Merge "Propagate pivot values of 0 to native layer" into klp-dev

Browse Source
This commit is contained in:
Chet Haase
2013-09-09 17:36:48 +00:00
committed by Android (Google) Code Review
parent b44ab9872a 183e2a351d
commit bbddd49d6d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/view/View.java
View File

@@ -9546,9 +9546,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*/ */
public void setPivotX(float pivotX) { public void setPivotX(float pivotX) {
ensureTransformationInfo(); ensureTransformationInfo();
mPrivateFlags |= PFLAG_PIVOT_EXPLICITLY_SET;
final TransformationInfo info = mTransformationInfo; 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); invalidateViewProperty(true, false);
info.mPivotX = pivotX; info.mPivotX = pivotX;
info.mMatrixDirty = true; info.mMatrixDirty = true;
@@ -9596,9 +9598,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*/ */
public void setPivotY(float pivotY) { public void setPivotY(float pivotY) {
ensureTransformationInfo(); ensureTransformationInfo();
mPrivateFlags |= PFLAG_PIVOT_EXPLICITLY_SET;
final TransformationInfo info = mTransformationInfo; 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); invalidateViewProperty(true, false);
info.mPivotY = pivotY; info.mPivotY = pivotY;
info.mMatrixDirty = true; info.mMatrixDirty = true;