summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2010-01-06 13:45:59 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-06 13:45:59 -0800
commit9e5f3ec97d468702aa3f3a59e94009e807715189 (patch)
tree3a32505efef25685741d917139124e0ec52bf851 /graphics/java
parentfbd3afb1801ed69a5c948241e68b997be3d84f4e (diff)
parente3bbaf6c4f51f8201922cae29daa7e46f6c43bda (diff)
downloadframeworks_base-9e5f3ec97d468702aa3f3a59e94009e807715189.zip
frameworks_base-9e5f3ec97d468702aa3f3a59e94009e807715189.tar.gz
frameworks_base-9e5f3ec97d468702aa3f3a59e94009e807715189.tar.bz2
am e3bbaf6c: Merge "set nine patch padding initially to an empty rectangle" into eclair-mr2
Merge commit 'e3bbaf6c4f51f8201922cae29daa7e46f6c43bda' into eclair-mr2-plus-aosp * commit 'e3bbaf6c4f51f8201922cae29daa7e46f6c43bda': set nine patch padding initially to an empty rectangle
Diffstat (limited to 'graphics/java')
-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;
}