diff options
| author | Alan Viverette <alanv@google.com> | 2014-02-01 01:43:16 -0800 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-02-01 01:43:16 -0800 |
| commit | edc4664d60af1f124d05f0a2b6ba58b837630f51 (patch) | |
| tree | 4b4c284d5af1c647ac3939a3f4b2b304913a25f7 | |
| parent | faa1057d4c6cc3941e42d93399fa9cf511c09370 (diff) | |
| download | frameworks_base-edc4664d60af1f124d05f0a2b6ba58b837630f51.zip frameworks_base-edc4664d60af1f124d05f0a2b6ba58b837630f51.tar.gz frameworks_base-edc4664d60af1f124d05f0a2b6ba58b837630f51.tar.bz2 | |
Fix broken build in BridgeResources
Change-Id: Iec58a2acda6b9538bcb5974d3d5c45ea6e53eac5
| -rw-r--r-- | core/java/android/content/res/Resources.java | 5 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/src/android/content/res/BridgeResources.java | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index b0b8d2d..185bfd8 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -94,12 +94,13 @@ public class Resources { private static final LongSparseArray<ColorStateList> sPreloadedColorStateLists = new LongSparseArray<ColorStateList>(); - private static Resources mSystem = null; + // Used by BridgeResources in layoutlib + static Resources mSystem = null; + private static boolean sPreloaded; private static int sPreloadedDensity; // These are protected by mAccessLock. - private final Object mAccessLock = new Object(); private final Configuration mTmpConfig = new Configuration(); private final LongSparseArray<WeakReference<Drawable.ConstantState>> mDrawableCache diff --git a/tools/layoutlib/bridge/src/android/content/res/BridgeResources.java b/tools/layoutlib/bridge/src/android/content/res/BridgeResources.java index 8794452..c3e06d2 100644 --- a/tools/layoutlib/bridge/src/android/content/res/BridgeResources.java +++ b/tools/layoutlib/bridge/src/android/content/res/BridgeResources.java @@ -51,6 +51,7 @@ public final class BridgeResources extends Resources { private BridgeContext mContext; private IProjectCallback mProjectCallback; private boolean[] mPlatformResourceFlag = new boolean[1]; + private TypedValue mTmpValue = new TypedValue(); /** * Simpler wrapper around FileInputStream. This is used when the input stream represent |