Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a489721e authored by Walter Jang's avatar Walter Jang
Browse files

Add multiselect to contact picker 

Bug 29502243
Bug 18641067

Change-Id: If5e0c500de752f19589817773c0ee59eb2217da3
parent e898f380

res/layout/contact_picker.xml

+9 −4
Original line number Diff line number Diff line
@@ -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>

res/layout/custom_action_bar.xml→res/menu/group_member_picker.xml

+31 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 The Android Open Source Project

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -14,26 +14,18 @@ 
     limitations under the License.

-->



<!-- Dimensions are set at runtime in ActionBarAdapter -->

<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="0dip"

    android:layout_height="0dip" >

<menu xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:contacts="http://schemas.android.com/apk/res-auto">



    <!-- To prevent the search view from getting the initial focus.  -->

    <View

        android:focusable="true"

        android:focusableInTouchMode="true"

        android:layout_width="1px"

        android:layout_height="1px" >

        <requestFocus />

    </View>

    <SearchView

        android:id="@+id/search_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:iconifiedByDefault="false"

        android:inputType="textFilter"

        android:theme="@style/ContactPickerSearchTheme" />

    <item

        android:id="@+id/menu_done"

        android:icon="@drawable/ic_done_wht_24dp"

        android:title="@string/menu_addContactsToGroup"

        contacts:showAsAction="always" />



</FrameLayout>
 
    <item

        android:id="@+id/menu_select"

        android:title="@string/menu_selectForGroup" />

        contacts:showAsAction="never" />



</menu>

res/menu/search_menu.xml

+3 −2
Original line number Diff line number Diff line
@@ -13,10 +13,11 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<menu xmlns:android="http://schemas.android.com/apk/res/android">

<menu xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:contacts="http://schemas.android.com/apk/res-auto">

    <item

        android:id="@+id/menu_search"

        android:icon="@drawable/ic_ab_search"

        android:title="@string/menu_search"

        android:showAsAction="always" />

        contacts:showAsAction="always" />

</menu>

res/values-sw600dp/styles.xml

+0 −5
Original line number Diff line number Diff line
@@ -15,11 +15,6 @@ 
-->

<resources>



    <style name="ContactPickerLayout" parent="ContactPickerTheme">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">match_parent</item>

    </style>



    <style name="DetailActivityTheme" parent="@android:Theme.Dialog">

        <item name="android:windowContentOverlay">@null</item>

    </style>

res/values/strings.xml

+8 −2
Original line number Diff line number Diff line
@@ -139,6 +139,12 @@ 
    <!-- Menu item to search for contacts to add to the currently selected label. CHAR LIMIT=30] -->

    <string name="menu_addToGroup">Add contact</string>



    <!-- Menu item to select multiple contacts to add to the currently selected label. CHAR LIMIT=30] -->

    <string name="menu_selectForGroup">Select contacts</string>



    <!-- Menu item to add selected contacts to the currently selected label. CHAR LIMIT=30] -->

    <string name="menu_addContactsToGroup">Add contacts</string>



    <!-- Menu item to remove the currently selected contacts from the currently selected label. [CHAR LIMIT=60] -->

    <string name="menu_removeFromGroup">Remove from label</string>
@@ -334,8 +340,8 @@ 
    <!-- Toast displayed when contacts are removed from a label. [CHAR LIMIT=50] -->

    <string name="groupMembersRemovedToast">Removed contacts</string>



    <!-- Toast displayed when a contact is added to a label. [CHAR LIMIT=50] -->

    <string name="groupMembersAddedToast">Added contact</string>

    <!-- Toast displayed when one or more contacts is added to a label. [CHAR LIMIT=50] -->

    <string name="groupMembersAddedToast">Added to label</string>



    <!-- Toast displayed when saving a label failed [CHAR LIMIT=70] -->

    <string name="groupSavedErrorToast">Couldn\'t save label changes.</string>