diff options
| author | George Mount <mount@google.com> | 2015-10-19 16:55:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-19 16:55:57 +0000 |
| commit | da97a54b679e19f4f40e23d290816093870956af (patch) | |
| tree | 86388dd83c4f23f786157b1f3426126f55ceadc0 /compiler/src/main | |
| parent | 876ba3272f17ed891ea455e7dd526d44e468757c (diff) | |
| parent | d0bb3f1e1a94747bb3dd8bd2fee315d8816f0f5d (diff) | |
| download | data-binding-da97a54b679e19f4f40e23d290816093870956af.tar.gz | |
Merge "Load drawables using the theme when necessary." into studio-master-dev
Diffstat (limited to 'compiler/src/main')
| -rw-r--r-- | compiler/src/main/java/android/databinding/tool/expr/ResourceExpr.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/src/main/java/android/databinding/tool/expr/ResourceExpr.java b/compiler/src/main/java/android/databinding/tool/expr/ResourceExpr.java index b20075b4..514fbc79 100644 --- a/compiler/src/main/java/android/databinding/tool/expr/ResourceExpr.java +++ b/compiler/src/main/java/android/databinding/tool/expr/ResourceExpr.java @@ -146,11 +146,11 @@ public class ResourceExpr extends Expr { if ("animator".equals(mResourceType)) return "android.animation.AnimatorInflater.loadAnimator(" + context + ", " + resourceName + ")"; if ("bool".equals(mResourceType)) return resources + ".getBoolean(" + resourceName + ")"; if ("color".equals(mResourceType)) return resources + ".getColor(" + resourceName + ")"; - if ("colorStateList".equals(mResourceType)) return resources + ".getColorStateList(" + resourceName + ")"; + if ("colorStateList".equals(mResourceType)) return "getColorStateListFromResource(" + resourceName + ")"; if ("dimen".equals(mResourceType)) return resources + ".getDimension(" + resourceName + ")"; if ("dimenOffset".equals(mResourceType)) return resources + ".getDimensionPixelOffset(" + resourceName + ")"; if ("dimenSize".equals(mResourceType)) return resources + ".getDimensionPixelSize(" + resourceName + ")"; - if ("drawable".equals(mResourceType)) return resources + ".getDrawable(" + resourceName + ")"; + if ("drawable".equals(mResourceType)) return "getDrawableFromResource(" + resourceName + ")"; if ("fraction".equals(mResourceType)) { String base = getChildCode(0, "1"); String pbase = getChildCode(1, "1"); |