summaryrefslogtreecommitdiff
path: root/compiler/src/main/java/android/databinding/tool/expr/ExprModel.java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2016-05-05 17:22:45 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-05 17:22:45 +0000
commit7a8035d874ac9d6934fac7081ce2427164c4beef (patch)
treed8ac8766a55b681a6b6d0d97ec79a24dd2a3fbed /compiler/src/main/java/android/databinding/tool/expr/ExprModel.java
parent17e0b4d441b1f319608f8e29f01e86c48aa387eb (diff)
parent78dc9ae6d67ae94bf3f637eeea0848e4f700b7a3 (diff)
downloaddata-binding-7a8035d874ac9d6934fac7081ce2427164c4beef.tar.gz
Fix problem where root View\'s style is used instead of bound View\'s
am: 78dc9ae6d6 * commit '78dc9ae6d67ae94bf3f637eeea0848e4f700b7a3': Fix problem where root View's style is used instead of bound View's Change-Id: I34f57b2a34becba6dee1f42fa770a99329b15260
Diffstat (limited to 'compiler/src/main/java/android/databinding/tool/expr/ExprModel.java')
-rw-r--r--compiler/src/main/java/android/databinding/tool/expr/ExprModel.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/src/main/java/android/databinding/tool/expr/ExprModel.java b/compiler/src/main/java/android/databinding/tool/expr/ExprModel.java
index 87169cee..34b25690 100644
--- a/compiler/src/main/java/android/databinding/tool/expr/ExprModel.java
+++ b/compiler/src/main/java/android/databinding/tool/expr/ExprModel.java
@@ -273,9 +273,9 @@ public class ExprModel {
return register(new UnaryExpr(op, expr));
}
- public Expr resourceExpr(String packageName, String resourceType, String resourceName,
- List<Expr> args) {
- return register(new ResourceExpr(packageName, resourceType, resourceName, args));
+ public Expr resourceExpr(BindingTarget target, String packageName, String resourceType,
+ String resourceName, List<Expr> args) {
+ return register(new ResourceExpr(target, packageName, resourceType, resourceName, args));
}
public Expr bracketExpr(Expr variableExpr, Expr argExpr) {