From 09f8e10e2a49a075da8bb2f64853377c5e37045a Mon Sep 17 00:00:00 2001 From: Yigit Boyar Date: Tue, 16 Feb 2016 16:11:30 -0800 Subject: Allow ObservableFields to be Bindable. This CL fixes a bug where if a field/accessor is Observable and Bindable, it would not be assigned a BR id, resulting in malformed generated code. Bug: 26922185 Change-Id: Ia3d11204460fc1967f0a7b60ed7cba1d3698098d --- .../src/main/java/android/databinding/tool/expr/FieldAccessExpr.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'compiler/src/main') diff --git a/compiler/src/main/java/android/databinding/tool/expr/FieldAccessExpr.java b/compiler/src/main/java/android/databinding/tool/expr/FieldAccessExpr.java index 810f363d..5d850b5d 100644 --- a/compiler/src/main/java/android/databinding/tool/expr/FieldAccessExpr.java +++ b/compiler/src/main/java/android/databinding/tool/expr/FieldAccessExpr.java @@ -299,6 +299,9 @@ public class FieldAccessExpr extends Expr { FieldAccessExpr observableField = getModel().observableField(child, mName); observableField.mGetter = mGetter; + if (hasBindableAnnotations()) { + observableField.mBrName = ExtKt.br(BrNameUtil.brKey(mGetter)); + } getChildren().add(observableField); observableField.getParents().add(this); -- cgit v1.2.3