From df030d2c160ff42927c58ff54c51049c69a48312 Mon Sep 17 00:00:00 2001
From: Chet Haase <chet@google.com>
Date: Fri, 30 Jul 2010 17:22:38 -0700
Subject: [PATCH] View x/y properties now feed into matrix translation

Change-Id: I35d8953ab6c7a511cdf90f3f94a4a1b5ef549fc3
---
 api/current.xml                       | 108 +++++------
 core/java/android/view/View.java      | 269 ++++++++++----------------
 core/java/android/view/ViewGroup.java |   3 +
 3 files changed, 157 insertions(+), 223 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index 22828c5036b40..aea2bb3134025 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -189429,6 +189429,28 @@
  visibility="public"
 >
 </method>
+<method name="getTranslationX"
+ return="float"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getTranslationY"
+ return="float"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getVerticalFadingEdgeLength"
  return="int"
  abstract="false"
@@ -189531,7 +189553,7 @@
 </parameter>
 </method>
 <method name="getX"
- return="int"
+ return="float"
  abstract="false"
  native="false"
  synchronized="false"
@@ -189542,7 +189564,7 @@
 >
 </method>
 <method name="getY"
- return="int"
+ return="float"
  abstract="false"
  native="false"
  synchronized="false"
@@ -190947,19 +190969,6 @@
 <parameter name="resid" type="int">
 </parameter>
 </method>
-<method name="setBottom"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="bottom" type="int">
-</parameter>
-</method>
 <method name="setClickable"
  return="void"
  abstract="false"
@@ -191168,19 +191177,6 @@
 <parameter name="params" type="android.view.ViewGroup.LayoutParams">
 </parameter>
 </method>
-<method name="setLeft"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="left" type="int">
-</parameter>
-</method>
 <method name="setLongClickable"
  return="void"
  abstract="false"
@@ -191423,19 +191419,6 @@
 <parameter name="pressed" type="boolean">
 </parameter>
 </method>
-<method name="setRight"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="right" type="int">
-</parameter>
-</method>
 <method name="setRotation"
  return="void"
  abstract="false"
@@ -191594,19 +191577,6 @@
 <parameter name="tag" type="java.lang.Object">
 </parameter>
 </method>
-<method name="setTop"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="top" type="int">
-</parameter>
-</method>
 <method name="setTouchDelegate"
  return="void"
  abstract="false"
@@ -191620,6 +191590,32 @@
 <parameter name="delegate" type="android.view.TouchDelegate">
 </parameter>
 </method>
+<method name="setTranslationX"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="translationX" type="float">
+</parameter>
+</method>
+<method name="setTranslationY"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="translationY" type="float">
+</parameter>
+</method>
 <method name="setVerticalFadingEdgeEnabled"
  return="void"
  abstract="false"
@@ -191695,7 +191691,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="x" type="int">
+<parameter name="x" type="float">
 </parameter>
 </method>
 <method name="setY"
@@ -191708,7 +191704,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="y" type="int">
+<parameter name="y" type="float">
 </parameter>
 </method>
 <method name="showContextMenu"
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 7666591d3e2d4..7c644e41b946b 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -1632,6 +1632,18 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
     @ViewDebug.ExportedProperty
     private float mRotation = 0f;
 
+    /**
+     * The amount of translation of the object away from its left property (post-layout).
+     */
+    @ViewDebug.ExportedProperty
+    private float mTranslationX = 0f;
+
+    /**
+     * The amount of translation of the object away from its top property (post-layout).
+     */
+    @ViewDebug.ExportedProperty
+    private float mTranslationY = 0f;
+
     /**
      * The amount of scale in the x direction around the pivot point. A
      * value of 1 means no scaling is applied.
@@ -4885,7 +4897,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
             // transform-related properties have changed since the last time someone
             // asked for the matrix; recalculate it with the current values
             mMatrix.reset();
-            mMatrix.setRotate(mRotation, mPivotX, mPivotY);
+            mMatrix.setTranslate(mTranslationX, mTranslationY);
+            mMatrix.preRotate(mRotation, mPivotX, mPivotY);
             mMatrix.preScale(mScaleX, mScaleY, mPivotX, mPivotY);
             mMatrixDirty = false;
             mMatrixIsIdentity = mMatrix.isIdentity();
@@ -5107,43 +5120,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
         return mTop;
     }
 
-    /**
-     * Sets the top position of this view relative to its parent.
-     *
-     * @param top The top of this view, in pixels.
-     */
-    public final void setTop(int top) {
-        if (top != mTop) {
-            if (hasIdentityMatrix()) {
-                final ViewParent p = mParent;
-                if (p != null && mAttachInfo != null) {
-                    final Rect r = mAttachInfo.mTmpInvalRect;
-                    int minTop;
-                    int yLoc;
-                    if (top < mTop) {
-                        minTop = top;
-                        yLoc = top - mTop;
-                    } else {
-                        minTop = mTop;
-                        yLoc = 0;
-                    }
-                    r.set(0, yLoc, mRight - mLeft, mBottom - minTop);
-                    p.invalidateChild(this, r);
-                }
-            } else {
-                // Double-invalidation is necessary to capture view's old and new areas
-                invalidate();
-            }
-
-            mTop = top;
-
-            if (!mMatrixIsIdentity) {
-                mPrivateFlags |= DRAWN; // force another invalidation with the new orientation
-                invalidate();
-            }
-        }
-    }
-
     /**
      * Bottom position of this view relative to its parent.
      *
@@ -5154,40 +5130,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
         return mBottom;
     }
 
-    /**
-     * Sets the bottom position of this view relative to its parent.
-     *
-     * @param bottom The bottom of this view, in pixels.
-     */
-    public final void setBottom(int bottom) {
-        if (bottom != mBottom) {
-            if (hasIdentityMatrix()) {
-                final ViewParent p = mParent;
-                if (p != null && mAttachInfo != null) {
-                    final Rect r = mAttachInfo.mTmpInvalRect;
-                    int maxBottom;
-                    if (bottom < mBottom) {
-                        maxBottom = mBottom;
-                    } else {
-                        maxBottom = bottom;
-                    }
-                    r.set(0, 0, mRight - mLeft, maxBottom - mTop);
-                    p.invalidateChild(this, r);
-                }
-            } else {
-                // Double-invalidation is necessary to capture view's old and new areas
-                invalidate();
-            }
-
-            mBottom = bottom;
-
-            if (!mMatrixIsIdentity) {
-                mPrivateFlags |= DRAWN; // force another invalidation with the new orientation
-                invalidate();
-            }
-        }
-    }
-
     /**
      * Left position of this view relative to its parent.
      *
@@ -5198,43 +5140,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
         return mLeft;
     }
 
-    /**
-     * Sets the left position of this view relative to its parent.
-     *
-     * @param left The bottom of this view, in pixels.
-     */
-    public final void setLeft(int left) {
-        if (left != mLeft) {
-            if (hasIdentityMatrix()) {
-                final ViewParent p = mParent;
-                if (p != null && mAttachInfo != null) {
-                    final Rect r = mAttachInfo.mTmpInvalRect;
-                    int minLeft;
-                    int xLoc;
-                    if (left < mLeft) {
-                        minLeft = left;
-                        xLoc = left - mLeft;
-                    } else {
-                        minLeft = mLeft;
-                        xLoc = 0;
-                    }
-                    r.set(xLoc, 0, mRight - minLeft, mBottom - mTop);
-                    p.invalidateChild(this, r);
-                }
-            } else {
-                // Double-invalidation is necessary to capture view's old and new areas
-                invalidate();
-            }
-
-            mLeft = left;
-
-            if (!mMatrixIsIdentity) {
-                mPrivateFlags |= DRAWN; // force another invalidation with the new orientation
-                invalidate();
-            }
-        }
-    }
-
     /**
      * Right position of this view relative to its parent.
      *
@@ -5246,79 +5151,109 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
     }
 
     /**
-     * Sets the right position of this view relative to its parent.
+     * The visual x position of this view, in pixels. This is equivalent to the
+     * {@link #setTranslationX(float) translationX} property plus the current
+     * {@link #getLeft() left} property. 
      *
-     * @param right The bottom of this view, in pixels.
+     * @return The visual x position of this view, in pixels.
      */
-    public final void setRight(int right) {
-        if (right != mRight) {
-            if (hasIdentityMatrix()) {
-                final ViewParent p = mParent;
-                if (p != null && mAttachInfo != null) {
-                    final Rect r = mAttachInfo.mTmpInvalRect;
-                    int maxRight;
-                    if (right < mRight) {
-                        maxRight = mRight;
-                    } else {
-                        maxRight = right;
-                    }
-                    r.set(0, 0, maxRight - mLeft, mBottom - mTop);
-                    p.invalidateChild(this, r);
-                }
-            } else {
-                // Double-invalidation is necessary to capture view's old and new areas
-                invalidate();
-            }
+    public float getX() {
+        return mLeft + mTranslationX;
+    }
 
-            mRight = right;
+    /**
+     * Sets the visual x position of this view, in pixels. This is equivalent to setting the
+     * {@link #setTranslationX(float) translationX} property to be the difference between
+     * the x value passed in and the current {@link #getLeft() left} property.
+     *
+     * @param x The visual x position of this view, in pixels.
+     */
+    public void setX(float x) {
+        setTranslationX(x - mLeft);
+    }
 
-            if (!mMatrixIsIdentity) {
-                mPrivateFlags |= DRAWN; // force another invalidation with the new orientation
-                invalidate();
-            }
+    /**
+     * The visual y position of this view, in pixels. This is equivalent to the
+     * {@link #setTranslationY(float) translationY} property plus the current
+     * {@link #getTop() top} property.
+     *
+     * @return The visual y position of this view, in pixels.
+     */
+    public float getY() {
+        return mTop + mTranslationY;
+    }
+
+    /**
+     * Sets the visual y position of this view, in pixels. This is equivalent to setting the
+     * {@link #setTranslationY(float) translationY} property to be the difference between
+     * the y value passed in and the current {@link #getTop() top} property.
+     *
+     * @param y The visual y position of this view, in pixels.
+     */
+    public void setY(float y) {
+        setTranslationY(y - mTop);
+    }
+
+
+    /**
+     * The horizontal location of this view relative to its {@link #getLeft() left} position.
+     * This position is post-layout, in addition to wherever the object's
+     * layout placed it.
+     *
+     * @return The horizontal position of this view relative to its left position, in pixels.
+     */
+    public float getTranslationX() {
+        return mTranslationX;
+    }
+
+    /**
+     * Sets the horizontal location of this view relative to its {@link #getLeft() left} position.
+     * This effectively positions the object post-layout, in addition to wherever the object's
+     * layout placed it.
+     *
+     * @param translationX The horizontal position of this view relative to its left position,
+     * in pixels.
+     */
+    public void setTranslationX(float translationX) {
+        if (mTranslationX != translationX) {
+            // Double-invalidation is necessary to capture view's old and new areas
+            invalidate();
+            mTranslationX = translationX;
+            mMatrixDirty = true;
+            mPrivateFlags |= DRAWN; // force another invalidation with the new orientation
+            invalidate();
         }
     }
 
     /**
-     * The horizontal location of this view relative to its parent. This value is equivalent to the
-     * {@link #getLeft() left} property.
+     * The horizontal location of this view relative to its {@link #getTop() top} position.
+     * This position is post-layout, in addition to wherever the object's
+     * layout placed it.
      *
-     * @return The horizontal position of this view, in pixels.
+     * @return The vertical position of this view relative to its top position,
+     * in pixels.
      */
-    public int getX() {
-        return mLeft;
+    public float getTranslationY() {
+        return mTranslationY;
     }
 
     /**
-     * Sets the horizontal location of this view relative to its parent. Setting this value will
-     * affect both the {@link #setLeft(int) left} and {@link #setRight(int) right} properties
-     * of this view.
+     * Sets the vertical location of this view relative to its {@link #getTop() top} position.
+     * This effectively positions the object post-layout, in addition to wherever the object's
+     * layout placed it.
      *
-     * @param x The horizontal position of this view, in pixels.
+     * @param translationY The vertical position of this view relative to its top position,
+     * in pixels.
      */
-    public void setX(int x) {
-        offsetLeftAndRight(x - mLeft);
-    }
-
-    /**
-     * The vertical location of this view relative to its parent. This value is equivalent to the
-     * {@link #getTop() left} property.
-     *
-     * @return The vertical position of this view, in pixels.
-     */
-    public int getY() {
-        return mTop;
-    }
-
-    /**
-     * Sets the vertical location of this view relative to its parent. Setting this value will
-     * affect both the {@link #setTop(int) left} and {@link #setBottom(int) right} properties
-     * of this view.
-     *
-     * @param y The vertical position of this view, in pixels.
-     */
-    public void setY(int y) {
-        offsetTopAndBottom(y - mTop);
+    public void setTranslationY(float translationY) {
+        if (mTranslationY != translationY) {
+            // Double-invalidation is necessary to capture view's old and new areas
+            invalidate();
+            mTranslationY = translationY;
+            mMatrixDirty = true;
+            mPrivateFlags |= DRAWN; // force another invalidation with the new orientation
+            invalidate();
+        }
     }
 
     /**
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index a713efcbb00af..9da56378684c4 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -1580,6 +1580,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
             }
         }
 
+        concatMatrix |= !child.hasIdentityMatrix();
+
         // Sets the flag as early as possible to allow draw() implementations
         // to call invalidate() successfully when doing animations
         child.mPrivateFlags |= DRAWN;
@@ -1744,6 +1746,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
         final View[] children = mChildren;
         final int count = mChildrenCount;
         for (int i = 0; i < count; i++) {
+            
             children[i].setSelected(selected);
         }
     }