diff --git a/res/anim/quickcontact_above_enter.xml b/res/anim/quickcontact_above_enter.xml
index a9c61d7..d86c98c 100644
--- a/res/anim/quickcontact_above_enter.xml
+++ b/res/anim/quickcontact_above_enter.xml
@@ -18,12 +18,12 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-    <scale android:interpolator="@android:anim/decelerate_quint_interpolator"
+    <scale android:interpolator="@android:interpolator/decelerate_quint"
             android:fromXScale="1" android:toXScale="1.0"
             android:fromYScale="0.8" android:toYScale="1.0"
             android:pivotX="50%" android:pivotY="100%"
             android:duration="@android:integer/config_shortAnimTime" />
-    <alpha android:interpolator="@android:anim/decelerate_cubic_interpolator"
+    <alpha android:interpolator="@android:interpolator/decelerate_cubic"
             android:fromAlpha="0.0" android:toAlpha="1.0"
             android:duration="@android:integer/config_shortAnimTime" />
 </set>
diff --git a/res/anim/quickcontact_above_exit.xml b/res/anim/quickcontact_above_exit.xml
index fd96ec2..e8a16b4 100644
--- a/res/anim/quickcontact_above_exit.xml
+++ b/res/anim/quickcontact_above_exit.xml
@@ -18,12 +18,12 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-    <scale android:interpolator="@android:anim/accelerate_quint_interpolator"
+    <scale android:interpolator="@android:interpolator/accelerate_quint"
             android:fromXScale="1.0" android:toXScale="1.0"
             android:fromYScale="1.0" android:toYScale=".8"
             android:pivotX="50%" android:pivotY="100%"
             android:duration="@android:integer/config_shortAnimTime" />
-    <alpha android:interpolator="@android:anim/accelerate_cubic_interpolator"
+    <alpha android:interpolator="@android:interpolator/accelerate_cubic"
             android:fromAlpha="1.0" android:toAlpha="0"
             android:duration="@android:integer/config_shortAnimTime" />
 </set>
diff --git a/res/anim/quickcontact_below_enter.xml b/res/anim/quickcontact_below_enter.xml
index 48a98b7..39aa177 100644
--- a/res/anim/quickcontact_below_enter.xml
+++ b/res/anim/quickcontact_below_enter.xml
@@ -18,12 +18,12 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-    <scale android:interpolator="@android:anim/decelerate_quint_interpolator"
+    <scale android:interpolator="@android:interpolator/decelerate_quint"
             android:fromXScale="1" android:toXScale="1.0"
             android:fromYScale="0.8" android:toYScale="1.0"
             android:pivotX="50%" android:pivotY="0%"
             android:duration="@android:integer/config_shortAnimTime" />
-    <alpha android:interpolator="@android:anim/decelerate_cubic_interpolator"
+    <alpha android:interpolator="@android:interpolator/decelerate_cubic"
             android:fromAlpha="0.0" android:toAlpha="1.0"
             android:duration="@android:integer/config_shortAnimTime" />
 </set>
diff --git a/res/anim/quickcontact_below_exit.xml b/res/anim/quickcontact_below_exit.xml
index 404d22e..8f70751 100644
--- a/res/anim/quickcontact_below_exit.xml
+++ b/res/anim/quickcontact_below_exit.xml
@@ -18,12 +18,12 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-    <scale android:interpolator="@android:anim/accelerate_quint_interpolator"
+    <scale android:interpolator="@android:interpolator/accelerate_quint"
             android:fromXScale="1.0" android:toXScale="1.0"
             android:fromYScale="1.0" android:toYScale="0.8"
             android:pivotX="50%" android:pivotY="0%"
             android:duration="@android:integer/config_shortAnimTime" />
-    <alpha android:interpolator="@android:anim/accelerate_cubic_interpolator"
+    <alpha android:interpolator="@android:interpolator/accelerate_cubic"
             android:fromAlpha="1.0" android:toAlpha="0"
             android:duration="@android:integer/config_shortAnimTime" />
 </set>
diff --git a/res/layout/join_contact_picker.xml b/res/layout/join_contact_picker.xml
index e0a6c2a..b45519e 100644
--- a/res/layout/join_contact_picker.xml
+++ b/res/layout/join_contact_picker.xml
@@ -14,9 +14,8 @@
      limitations under the License.
 -->
 
-<view
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    class="com.android.contacts.widget.FullHeightLinearLayout"
     style="@style/ContactPickerLayout"
     android:paddingLeft="20dip"
     android:paddingRight="20dip"
@@ -26,4 +25,4 @@
         android:layout_height="match_parent"
         android:id="@+id/list_container">
     </FrameLayout>
-</view>
+</LinearLayout>