diff options
| author | Yigit Boyar <yboyar@google.com> | 2016-02-16 16:11:30 -0800 |
|---|---|---|
| committer | Yigit Boyar <yboyar@google.com> | 2016-02-16 16:22:06 -0800 |
| commit | 09f8e10e2a49a075da8bb2f64853377c5e37045a (patch) | |
| tree | eea7acd39e38da3b9f4cc7e12a7dc83dc22df74c /compiler/src/main | |
| parent | 6047998943beebd81e0ae1068df39c0cbee38628 (diff) | |
| download | data-binding-09f8e10e2a49a075da8bb2f64853377c5e37045a.tar.gz | |
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
Diffstat (limited to 'compiler/src/main')
| -rw-r--r-- | compiler/src/main/java/android/databinding/tool/expr/FieldAccessExpr.java | 3 |
1 files changed, 3 insertions, 0 deletions
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); |