summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/ImageView.java
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2012-04-20 09:54:27 -0700
committerChet Haase <chet@google.com>2012-04-23 11:13:17 -0700
commit1271e2cc80b01d577e9db339459ef0222bb9320d (patch)
treed308bb451af2ecf76715ec0389de3e95b60e6d5a /core/java/android/widget/ImageView.java
parent003952ba33f711963ad26588b2aca293deb8d50a (diff)
downloadframeworks_base-1271e2cc80b01d577e9db339459ef0222bb9320d.zip
frameworks_base-1271e2cc80b01d577e9db339459ef0222bb9320d.tar.gz
frameworks_base-1271e2cc80b01d577e9db339459ef0222bb9320d.tar.bz2
Remove USE_DISPLAY_LIST_PROPERTIES flag
This flag was still hanging around pending any need to disable DisplayList properties. But things seem stable, so it's time to clean up and simplify the code. At the same time, I reduced redundance in DisplayList dimensions. We used to call drawDisplayList() with width/height parameters that were used to do a clip reject. This is redundant with the DisplayList properties that set the bounds of the DisplayList; the left/right and top/bottom properties represent the same width/height properties formerly used in drawDisplayList(). The new approach is to not pass dimensions to drawDisplayList(), but to instead pull those dimensions directly from the DisplayList when needed. Change-Id: I8871beff03b1d4be95f7c6e079c31a71d31e0c56
Diffstat (limited to 'core/java/android/widget/ImageView.java')
-rw-r--r--core/java/android/widget/ImageView.java20
1 files changed, 1 insertions, 19 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java
index 6c7ea67..7593bff 100644
--- a/core/java/android/widget/ImageView.java
+++ b/core/java/android/widget/ImageView.java
@@ -200,26 +200,8 @@ public class ImageView extends View {
}
@Override
- protected boolean onSetAlpha(int alpha) {
- if (!USE_DISPLAY_LIST_PROPERTIES && getBackground() == null) {
- int scale = alpha + (alpha >> 7);
- if (mViewAlphaScale != scale) {
- mViewAlphaScale = scale;
- mColorMod = true;
- applyColorMod();
- }
- return true;
- }
- return false;
- }
-
- @Override
public boolean hasOverlappingRendering() {
- if (!USE_DISPLAY_LIST_PROPERTIES) {
- return super.hasOverlappingRendering();
- } else {
- return (getBackground() != null);
- }
+ return (getBackground() != null);
}
@Override