commit a489721e65c5f549ab26272af08eb2d05a869976
author Walter Jang <wjang@google.com> Tue Jun 21 19:02:23 2016 -0700
committer Walter Jang <wjang@google.com> Wed Jun 22 16:25:29 2016 -0700
tree 7cacecf26e51b950eac0767545b7c157b45c4213
parent e898f380e23b8ed1b7aebbae690dd9383f82a04f

Add multiselect to contact picker

Bug 29502243
Bug 18641067

Change-Id: If5e0c500de752f19589817773c0ee59eb2217da3

res/layout/contact_picker.xml

diff --git a/res/layout/contact_picker.xml b/res/layout/contact_picker.xml
index 2efe471..faf5563 100644
--- a/res/layout/contact_picker.xml
+++ b/res/layout/contact_picker.xml
@@ -14,9 +14,14 @@
      limitations under the License.
 -->
 
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/ContactPickerLayout"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/list_container"
+    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent" >
+
+    <include
+        layout="@layout/people_activity_toolbar"
+        android:id="@+id/toolbar_parent" />
+
+</LinearLayout>