Make setVariable return true for declared variables.

Bug 23518718

Change-Id: Ic147421aefe0adbf576285ca642334fcb907abfb

4 files changed, 24 insertions, 4 deletions

diff --git a/integration-tests/TestApp/app/src/androidTestApi7/java/android/databinding/testapp/multiconfig/LandscapeConfigTest.java b/integration-tests/TestApp/app/src/androidTestApi7/java/android/databinding/testapp/multiconfig/LandscapeConfigTest.java
index 965562f9..ddda2695 100644
--- a/integration-tests/TestApp/app/src/androidTestApi7/java/android/databinding/testapp/multiconfig/LandscapeConfigTest.java
+++ b/integration-tests/TestApp/app/src/androidTestApi7/java/android/databinding/testapp/multiconfig/LandscapeConfigTest.java
@@ -15,6 +15,7 @@ package android.databinding.testapp.multiconfig;
 
 import android.databinding.ViewDataBinding;
 import android.databinding.testapp.BaseLandDataBinderTest;
+import android.databinding.testapp.BR;
 import android.databinding.testapp.R;
 import android.databinding.testapp.databinding.BasicBindingBinding;
 import android.databinding.testapp.databinding.ConditionalBindingBinding;
@@ -23,6 +24,7 @@ import android.databinding.testapp.databinding.MultiResLayoutBinding;
 import android.databinding.testapp.vo.NotBindableVo;
 
 import android.content.pm.ActivityInfo;
+import android.test.UiThreadTest;
 import android.view.View;
 import android.widget.TextView;
 
@@ -49,4 +51,13 @@ public class LandscapeConfigTest extends BaseLandDataBinderTest<MultiResLayoutBi
         assertPublicField(ConditionalBindingBinding.class, "includedLayoutPort");
         assertPublicField(ConditionalBindingBinding.class, "includedLayoutLand");
     }
+
+    @UiThreadTest
+    public void testSetVariable() throws Throwable {
+        initBinder();
+        assertTrue(mBinder.setVariable(BR.objectInBoth, null));
+        assertTrue(mBinder.setVariable(BR.objectInDefault, null));
+        assertTrue(mBinder.setVariable(BR.objectInLand, null));
+        assertFalse(mBinder.setVariable(BR.obj, null));
+    }
 }
diff --git a/integration-tests/TestApp/app/src/androidTestApi7/java/android/databinding/testapp/multiconfig/PortraitConfigTest.java b/integration-tests/TestApp/app/src/androidTestApi7/java/android/databinding/testapp/multiconfig/PortraitConfigTest.java
index b1d1469a..6a259bb2 100644
--- a/integration-tests/TestApp/app/src/androidTestApi7/java/android/databinding/testapp/multiconfig/PortraitConfigTest.java
+++ b/integration-tests/TestApp/app/src/androidTestApi7/java/android/databinding/testapp/multiconfig/PortraitConfigTest.java
@@ -15,6 +15,7 @@ package android.databinding.testapp.multiconfig;
 
 import android.databinding.ViewDataBinding;
 import android.databinding.testapp.BaseDataBinderTest;
+import android.databinding.testapp.BR;
 import android.databinding.testapp.databinding.BasicBindingBinding;
 import android.databinding.testapp.databinding.ConditionalBindingBinding;
 import android.databinding.testapp.databinding.IncludedLayoutBinding;
@@ -22,6 +23,7 @@ import android.databinding.testapp.databinding.MultiResLayoutBinding;
 import android.databinding.testapp.vo.NotBindableVo;
 
 import android.content.pm.ActivityInfo;
+import android.test.UiThreadTest;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -47,4 +49,13 @@ public class PortraitConfigTest extends BaseDataBinderTest<MultiResLayoutBinding
         assertPublicField(ConditionalBindingBinding.class, "includedLayoutPort");
         assertPublicField(ConditionalBindingBinding.class, "includedLayoutLand");
     }
+
+    @UiThreadTest
+    public void testSetVariable() throws Throwable {
+        initBinder();
+        assertTrue(mBinder.setVariable(BR.objectInBoth, null));
+        assertTrue(mBinder.setVariable(BR.objectInDefault, null));
+        assertFalse(mBinder.setVariable(BR.obj, null));
+        assertFalse(mBinder.setVariable(BR.objectInLand, null));
+    }
 }
diff --git a/integration-tests/TestApp/app/src/main/res/layout-land/multi_res_layout.xml b/integration-tests/TestApp/app/src/main/res/layout-land/multi_res_layout.xml
index bb2f58d8..2b47694c 100644
--- a/integration-tests/TestApp/app/src/main/res/layout-land/multi_res_layout.xml
+++ b/integration-tests/TestApp/app/src/main/res/layout-land/multi_res_layout.xml
@@ -14,12 +14,9 @@
 
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:bind="http://schemas.android.com/apk/res-auto">
-
-
-
-
     <data>
         <variable name="objectInLand" type="android.databinding.testapp.vo.NotBindableVo"/>
+        <variable name="objectInBoth" type="Object"/>
     </data>
     <LinearLayout
             android:orientation="vertical"
diff --git a/integration-tests/TestApp/app/src/main/res/layout/multi_res_layout.xml b/integration-tests/TestApp/app/src/main/res/layout/multi_res_layout.xml
index 41031a7a..0a80250d 100644
--- a/integration-tests/TestApp/app/src/main/res/layout/multi_res_layout.xml
+++ b/integration-tests/TestApp/app/src/main/res/layout/multi_res_layout.xml
@@ -16,6 +16,7 @@
         xmlns:bind="http://schemas.android.com/apk/res-auto">
     <data>
         <variable name="objectInDefault" type="android.databinding.testapp.vo.NotBindableVo"/>
+        <variable name="objectInBoth" type="Object"/>
     </data>
     <LinearLayout
             android:orientation="vertical"