summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2010-02-08 17:40:30 -0800
committerJeff Sharkey <jsharkey@android.com>2010-02-17 15:03:32 -0800
commit2b95c2413838c2e2b127ebab8fb4fead7d52e460 (patch)
tree152840f97e63ab28962c5f351217fa8088686f13 /graphics
parent6a70d7d1e28bd0b98d03e7ecab3fd08ea5973e34 (diff)
downloadframeworks_base-2b95c2413838c2e2b127ebab8fb4fead7d52e460.zip
frameworks_base-2b95c2413838c2e2b127ebab8fb4fead7d52e460.tar.gz
frameworks_base-2b95c2413838c2e2b127ebab8fb4fead7d52e460.tar.bz2
Added more @RemotableViewMethod methods, mutate ImageView.
Catch some View methods missed during the first pass of marking with @RemotableViewMethod annotation. Also adds new ImageView.setColorFilter(int) to match the android:tint XML attribute. When ImageView touches ColorFilter or alpha, mutate the underlying Drawable. Fix NPE in StateListDrawable.mutate().
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/drawable/StateListDrawable.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/StateListDrawable.java b/graphics/java/android/graphics/drawable/StateListDrawable.java
index b1d588e..b94df84 100644
--- a/graphics/java/android/graphics/drawable/StateListDrawable.java
+++ b/graphics/java/android/graphics/drawable/StateListDrawable.java
@@ -238,7 +238,10 @@ public class StateListDrawable extends DrawableContainer {
final int count = sets.length;
mStateListState.mStateSets = new int[count][];
for (int i = 0; i < count; i++) {
- mStateListState.mStateSets[i] = sets[i].clone();
+ final int[] set = sets[i];
+ if (set != null) {
+ mStateListState.mStateSets[i] = set.clone();
+ }
}
mMutated = true;
}