summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2009-08-20 13:58:52 -0700
committerJeff Sharkey <jsharkey@android.com>2009-08-22 22:44:00 -0700
commit6afa16feb32d44c4977b3eb6007246a99f22fdbf (patch)
treefc70d4bb9df37641fc7fc7f220d7d5825dd5c785
parenta5fa36481cdbe2cd324055d9f508e492482cb7dc (diff)
downloadframeworks_base-6afa16feb32d44c4977b3eb6007246a99f22fdbf.zip
frameworks_base-6afa16feb32d44c4977b3eb6007246a99f22fdbf.tar.gz
frameworks_base-6afa16feb32d44c4977b3eb6007246a99f22fdbf.tar.bz2
Add dither XML flag to StateListDrawable.
We currently allow the dither="true" flag to be set on individual <bitmap> and <nine-patch> objects, but that flag is overridden when they are included in a <selector>. This change adds the dither="true" flag to StateListDrawable so they can be dithered when desired. Fixes http://b/issue?id=2068024
-rw-r--r--core/res/res/values/attrs.xml6
-rw-r--r--graphics/java/android/graphics/drawable/StateListDrawable.java2
2 files changed, 7 insertions, 1 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 403d07d..cd3f065 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -2274,6 +2274,10 @@
of the states. If false, the size will vary based on the
current state. -->
<attr name="constantSize" format="boolean" />
+ <!-- Enables or disables dithering of the bitmap if the bitmap does not have the
+ same pixel configuration as the screen (for instance: a ARGB 8888 bitmap with
+ an RGB 565 screen.) -->
+ <attr name="dither" format="boolean" />
</declare-styleable>
<declare-styleable name="AnimationDrawable">
@@ -2420,7 +2424,7 @@
<!-- Enables or disables dithering of the bitmap if the bitmap does not have the
same pixel configuration as the screen (for instance: a ARGB 8888 bitmap with
an RGB 565 screen.) -->
- <attr name="dither" format="boolean" />
+ <attr name="dither" />
<!-- Defines the gravity for the bitmap. The gravity indicates where to position
the drawable in its container if the bitmap is smaller than the container. -->
<attr name="gravity" />
diff --git a/graphics/java/android/graphics/drawable/StateListDrawable.java b/graphics/java/android/graphics/drawable/StateListDrawable.java
index d22a4ba..a8274b1 100644
--- a/graphics/java/android/graphics/drawable/StateListDrawable.java
+++ b/graphics/java/android/graphics/drawable/StateListDrawable.java
@@ -105,6 +105,8 @@ public class StateListDrawable extends DrawableContainer {
mStateListState.setConstantSize(a.getBoolean(
com.android.internal.R.styleable.StateListDrawable_constantSize, false));
+ setDither(a.getBoolean(com.android.internal.R.styleable.StateListDrawable_dither, false));
+
a.recycle();
int type;