summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-07-19 09:11:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-19 09:11:17 -0700
commitb5b37f3bcc3065959c27e588f065dfb33a061e1d (patch)
treed020683a2ed2d9e729814012147d0627d3976023 /tools/layoutlib
parent6181f39257ecd8a93b1c43ddef771734dfef8f49 (diff)
parent3d02b48bd95293c767563729264f007dbcff82b3 (diff)
downloadframeworks_base-b5b37f3bcc3065959c27e588f065dfb33a061e1d.zip
frameworks_base-b5b37f3bcc3065959c27e588f065dfb33a061e1d.tar.gz
frameworks_base-b5b37f3bcc3065959c27e588f065dfb33a061e1d.tar.bz2
am 3d02b48b: merge from open-source master
Merge commit '3d02b48bd95293c767563729264f007dbcff82b3' * commit '3d02b48bd95293c767563729264f007dbcff82b3': Fix the layoutlib Paint.set(Paint) method.
Diffstat (limited to 'tools/layoutlib')
-rw-r--r--tools/layoutlib/bridge/src/android/graphics/Paint.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/Paint.java b/tools/layoutlib/bridge/src/android/graphics/Paint.java
index 619ab30..d13b5fe 100644
--- a/tools/layoutlib/bridge/src/android/graphics/Paint.java
+++ b/tools/layoutlib/bridge/src/android/graphics/Paint.java
@@ -283,6 +283,8 @@ public class Paint extends _Original_Paint {
mStyle = src.mStyle;
mFlags = src.mFlags;
+ updateFontObject();
+
super.set(src);
}
}