summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2010-01-06 14:05:58 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-06 14:05:58 -0800
commit9027696bf01d712658db9ff3003d0c11a89ddc2a (patch)
tree49fc6c5fe960d1cb827596da57b4815350624f6e /graphics
parentf291b9fecb1e7537d614ba8e45b5b43a7e8bc76f (diff)
parent9e5f3ec97d468702aa3f3a59e94009e807715189 (diff)
downloadframeworks_base-9027696bf01d712658db9ff3003d0c11a89ddc2a.zip
frameworks_base-9027696bf01d712658db9ff3003d0c11a89ddc2a.tar.gz
frameworks_base-9027696bf01d712658db9ff3003d0c11a89ddc2a.tar.bz2
am 9e5f3ec9: am e3bbaf6c: Merge "set nine patch padding initially to an empty rectangle" into eclair-mr2
Merge commit '9e5f3ec97d468702aa3f3a59e94009e807715189' * commit '9e5f3ec97d468702aa3f3a59e94009e807715189': set nine patch padding initially to an empty rectangle
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/drawable/NinePatchDrawable.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/drawable/NinePatchDrawable.java b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
index 67a8015..bad94fb 100644
--- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java
+++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
@@ -81,7 +81,7 @@ public class NinePatchDrawable extends Drawable {
*/
@Deprecated
public NinePatchDrawable(NinePatch patch) {
- this(new NinePatchState(patch, null), null);
+ this(new NinePatchState(patch, new Rect()), null);
}
/**
@@ -89,7 +89,7 @@ public class NinePatchDrawable extends Drawable {
* based on the display metrics of the resources.
*/
public NinePatchDrawable(Resources res, NinePatch patch) {
- this(new NinePatchState(patch, null), res);
+ this(new NinePatchState(patch, new Rect()), res);
mNinePatchState.mTargetDensity = mTargetDensity;
}