Move to package android.databinding.

5 files changed, 12 insertions, 13 deletions

diff --git a/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/DataBoundAdapter.java b/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/DataBoundAdapter.java
index 0f4abaa3..89eef682 100644
--- a/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/DataBoundAdapter.java
+++ b/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/DataBoundAdapter.java
@@ -3,8 +3,8 @@ package com.android.example.bindingdemo;
 import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
-import com.android.databinding.library.DataBindingUtil;
-import com.android.databinding.library.ViewDataBinding;
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
 
 abstract public class DataBoundAdapter<T extends ViewDataBinding>
         extends RecyclerView.Adapter<DataBoundAdapter.DataBoundViewHolder<T>> {
diff --git a/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/MainActivity.java b/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/MainActivity.java
index aa7661ac..54df3f14 100644
--- a/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/MainActivity.java
+++ b/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/MainActivity.java
@@ -1,9 +1,8 @@
 package com.android.example.bindingdemo;
 
-import android.binding.Bindable;
-import android.binding.BinderBundle;
-import android.binding.Observable;
-import android.binding.OnPropertyChangedListener;
+import android.databinding.Bindable;
+import android.databinding.Observable;
+import android.databinding.OnPropertyChangedListener;
 import android.support.v7.app.ActionBarActivity;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
@@ -13,8 +12,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.databinding.library.DataBindingUtil;
-import com.android.databinding.library.PropertyChangeRegistry;
+import android.databinding.DataBindingUtil;
+import android.databinding.PropertyChangeRegistry;
 import com.android.example.bindingdemo.generated.ListItemBinding;
 import com.android.example.bindingdemo.generated.MainActivityBinding;
 import com.android.example.bindingdemo.vo.User;
diff --git a/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/vo/User.java b/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/vo/User.java
index 92523216..5b7e5c7e 100644
--- a/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/vo/User.java
+++ b/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/vo/User.java
@@ -1,9 +1,9 @@
 package com.android.example.bindingdemo.vo;
 
-import android.binding.Bindable;
+import android.databinding.Bindable;
 import android.graphics.Color;
 
-import com.android.databinding.library.BaseObservable;
+import android.databinding.BaseObservable;
 import com.android.example.bindingdemo.BR;
 
 import java.util.Objects;
diff --git a/samples/BindingDemo/app/src/main/res/layout/list_item.xml b/samples/BindingDemo/app/src/main/res/layout/list_item.xml
index ea0ddd3f..1aaf2f0e 100644
--- a/samples/BindingDemo/app/src/main/res/layout/list_item.xml
+++ b/samples/BindingDemo/app/src/main/res/layout/list_item.xml
@@ -43,4 +43,4 @@
         android:text='@{user.name.substring(0,1).toUpperCase() + "." + user.lastName}'
         android:layout_width="wrap_content"
         android:layout_height="match_parent" />
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</android.support.v7.widget.CardView>
diff --git a/samples/BindingDemo/app/src/test/java/com/android/example/bindingdemo/vo/UnitTest.java b/samples/BindingDemo/app/src/test/java/com/android/example/bindingdemo/vo/UnitTest.java
index 7f0ba3af..65449cec 100644
--- a/samples/BindingDemo/app/src/test/java/com/android/example/bindingdemo/vo/UnitTest.java
+++ b/samples/BindingDemo/app/src/test/java/com/android/example/bindingdemo/vo/UnitTest.java
@@ -1,6 +1,6 @@
 package com.android.example.bindingdemo.vo;
 
-import android.binding.OnPropertyChangedListener;
+import android.databinding.OnPropertyChangedListener;
 
 import com.android.example.bindingdemo.R;
 
@@ -37,4 +37,4 @@ public class UnitTest {
         verify(mockListener).onPropertyChanged(testUser, BR.name);
         verifyNoMoreInteractions(mockListener);
     }
-}
\ No newline at end of file
+}