diff options
| author | John Reck <jreck@google.com> | 2014-06-12 17:07:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-10 21:38:43 +0000 |
| commit | e830c37a4a499c439083afc56c64fa178ea5889d (patch) | |
| tree | 2827de0c15a7711f5286839d3f1db3b30181aec8 /core/java/android | |
| parent | 0811cbee480524521750f43ac2a608cf84dba8aa (diff) | |
| parent | a447d29c65fb811cd184775a3476101a1cede929 (diff) | |
| download | frameworks_base-e830c37a4a499c439083afc56c64fa178ea5889d.zip frameworks_base-e830c37a4a499c439083afc56c64fa178ea5889d.tar.gz frameworks_base-e830c37a4a499c439083afc56c64fa178ea5889d.tar.bz2 | |
Merge "Fix DA bugs"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/RenderNode.java | 8 | ||||
| -rw-r--r-- | core/java/android/view/View.java | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/core/java/android/view/RenderNode.java b/core/java/android/view/RenderNode.java index 4631b64..c165475 100644 --- a/core/java/android/view/RenderNode.java +++ b/core/java/android/view/RenderNode.java @@ -842,13 +842,6 @@ public class RenderNode { } /** - * Sets the scroll position, this is used for damage calculations - */ - public void setScrollPosition(int x, int y) { - nSetScrollPosition(mNativeRenderNode, x, y); - } - - /** * Outputs the display list to the log. This method exists for use by * tools to output display lists for selected nodes to the log. * @@ -906,7 +899,6 @@ public class RenderNode { private static native boolean nSetRight(long renderNode, int right); private static native boolean nSetTop(long renderNode, int top); private static native boolean nSetLeft(long renderNode, int left); - private static native void nSetScrollPosition(long renderNode, int scrollX, int scrollY); private static native boolean nSetCameraDistance(long renderNode, float distance); private static native boolean nSetPivotY(long renderNode, float pivotY); private static native boolean nSetPivotX(long renderNode, float pivotX); diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 65b1f8c..434f853 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -13738,7 +13738,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, return; } - renderNode.setScrollPosition(mScrollX, mScrollY); if ((mPrivateFlags & PFLAG_DRAWING_CACHE_VALID) == 0 || !renderNode.isValid() || (!isLayer && mRecreateDisplayList)) { |