summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-02-05 17:52:02 -0800
committerAlan Viverette <alanv@google.com>2014-02-05 17:53:33 -0800
commitd5154ec2bc7e7c0bdfd14fc784912d390afe43cc (patch)
tree949021561aff16d06757dcded552aa31bd0bc11a /core
parent0e29ad02f9ed46f2f2a9de59249969f9d1bdd7f6 (diff)
downloadframeworks_base-d5154ec2bc7e7c0bdfd14fc784912d390afe43cc.zip
frameworks_base-d5154ec2bc7e7c0bdfd14fc784912d390afe43cc.tar.gz
frameworks_base-d5154ec2bc7e7c0bdfd14fc784912d390afe43cc.tar.bz2
Add prototype for borderless touch feedback drawable
Change-Id: I6366855b1fb838aa077bc6bdb62adc2134c51dca
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/View.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 2111c68..2710fdf 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -14983,7 +14983,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @param displayList Valid display list for the background drawable
*/
private void setBackgroundDisplayListProperties(DisplayList displayList) {
- displayList.setProjectBackwards((mPrivateFlags3 & PFLAG3_PROJECT_BACKGROUND) != 0);
displayList.setTranslationX(mScrollX);
displayList.setTranslationY(mScrollY);
}
@@ -15014,6 +15013,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
// Set up drawable properties that are view-independent.
displayList.setLeftTopRightBottom(bounds.left, bounds.top, bounds.right, bounds.bottom);
+ displayList.setProjectBackwards(drawable.isProjected());
displayList.setClipToBounds(false);
return displayList;
}
@@ -15367,7 +15367,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
mBackgroundDisplayList.clear();
}
- final Rect dirty = drawable.getBounds();
+ final Rect dirty = drawable.getDirtyBounds();
final int scrollX = mScrollX;
final int scrollY = mScrollY;