Implement new QuickContact design

 - Also removes default-functionality
 - Fixes the flicker when dismissing (Bug:5025418)

Change-Id: I46cf0fbdb2dcbf002612672e5e8f81a9b1ab6939
diff --git a/res/layout/quickcontact_activity.xml b/res/layout/quickcontact_activity.xml
index aced4a8..7aa2aa4 100644
--- a/res/layout/quickcontact_activity.xml
+++ b/res/layout/quickcontact_activity.xml
@@ -22,7 +22,23 @@
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:descendantFocusability="afterDescendants">
-
-    <include layout="@layout/quickcontact" />
-
+    <LinearLayout
+        android:id="@android:id/content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="15dip"
+        android:paddingRight="15dip"
+        android:orientation="vertical">
+        <include layout="@layout/quickcontact_photo_container" />
+        <View
+            android:id="@+id/line_before_track"
+            android:layout_width="match_parent"
+            android:layout_height="2dip"
+            android:background="@color/quickcontact_list_background" />
+        <include layout="@layout/quickcontact_track" />
+        <android.support.v4.view.ViewPager
+            android:id="@+id/item_list_pager"
+            android:layout_width="match_parent"
+            android:layout_height="180dip" />
+    </LinearLayout>
 </view>