summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/Paint.java20
-rw-r--r--graphics/java/android/graphics/drawable/ClipDrawable.java1
-rw-r--r--graphics/java/android/graphics/drawable/LayerDrawable.java1
-rw-r--r--graphics/java/android/graphics/drawable/StateListDrawable.java1
4 files changed, 22 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java
index f68f9dc..4170cfe 100644
--- a/graphics/java/android/graphics/Paint.java
+++ b/graphics/java/android/graphics/Paint.java
@@ -371,12 +371,30 @@ public class Paint {
public void reset() {
native_reset(mNativePaint);
setFlags(DEFAULT_PAINT_FLAGS);
+
// TODO: Turning off hinting has undesirable side effects, we need to
// revisit hinting once we add support for subpixel positioning
// setHinting(DisplayMetrics.DENSITY_DEVICE >= DisplayMetrics.DENSITY_TV
// ? HINTING_OFF : HINTING_ON);
+
+ mColorFilter = null;
+ mMaskFilter = null;
+ mPathEffect = null;
+ mRasterizer = null;
+ mShader = null;
+ mTypeface = null;
+ mXfermode = null;
+
mHasCompatScaling = false;
- mCompatScaling = mInvCompatScaling = 1;
+ mCompatScaling = 1;
+ mInvCompatScaling = 1;
+
+ hasShadow = false;
+ shadowDx = 0;
+ shadowDy = 0;
+ shadowRadius = 0;
+ shadowColor = 0;
+
mBidiFlags = BIDI_DEFAULT_LTR;
setTextLocale(Locale.getDefault());
}
diff --git a/graphics/java/android/graphics/drawable/ClipDrawable.java b/graphics/java/android/graphics/drawable/ClipDrawable.java
index 723db6e..b7429d4 100644
--- a/graphics/java/android/graphics/drawable/ClipDrawable.java
+++ b/graphics/java/android/graphics/drawable/ClipDrawable.java
@@ -239,6 +239,7 @@ public class ClipDrawable extends Drawable implements Drawable.Callback {
return null;
}
+ /** @hide */
@Override
public void setLayoutDirection(int layoutDirection) {
mClipState.mDrawable.setLayoutDirection(layoutDirection);
diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java
index 03531ac..0351b71 100644
--- a/graphics/java/android/graphics/drawable/LayerDrawable.java
+++ b/graphics/java/android/graphics/drawable/LayerDrawable.java
@@ -590,6 +590,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
return this;
}
+ /** @hide */
@Override
public void setLayoutDirection(int layoutDirection) {
if (getLayoutDirection() != layoutDirection) {
diff --git a/graphics/java/android/graphics/drawable/StateListDrawable.java b/graphics/java/android/graphics/drawable/StateListDrawable.java
index a5c3614..f8f3ac9 100644
--- a/graphics/java/android/graphics/drawable/StateListDrawable.java
+++ b/graphics/java/android/graphics/drawable/StateListDrawable.java
@@ -261,6 +261,7 @@ public class StateListDrawable extends DrawableContainer {
return this;
}
+ /** @hide */
@Override
public void setLayoutDirection(int layoutDirection) {
final int numStates = getStateCount();