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

Commit 3822d54b authored by Walter Jang's avatar Walter Jang Committed by Android (Google) Code Review
Browse files

Merge "Add insert, add a contact, and edit name to group activity"

parents 8bf40578 44e91b16

res/layout/group_members_activity.xml

+0 −6
Original line number Diff line number Diff line
@@ -25,10 +25,4 @@ 
        layout="@layout/people_activity_toolbar"

        android:id="@+id/toolbar_parent" />



    <com.android.contacts.widget.NoSwipeViewPager

        android:id="@+id/view_pager"

        android:layout_width="match_parent"

        android:layout_height="0px"

        android:layout_weight="1"/>



</LinearLayout>
 
 No newline at end of file

res/layout/create_group_dialog.xml→res/layout/group_name_edit_dialog.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,6 @@ 
        android:layout_marginLeft="4dp"

        android:layout_marginRight="4dp"

        android:layout_marginTop="16dp"

        android:inputType="textCapWords"

        android:inputType="textCapWords|textNoSuggestions"

        android:maxLength="40"/>

</LinearLayout>
 
 No newline at end of file

res/menu/view_group.xml

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,12 @@ 
<menu xmlns:android="http://schemas.android.com/apk/res/android"

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



    <item

        android:id="@+id/menu_add"

        android:icon="@drawable/ic_person_add_tinted_24dp"

        android:title="@string/menu_addToGroup"

        contacts:showAsAction="ifRoom" />



    <item

        android:id="@+id/menu_edit_group"

        android:icon="@drawable/ic_create_24dp"

res/values/strings.xml

+18 −3
Original line number Diff line number Diff line
@@ -320,9 +320,24 @@ 
    <!-- Toast displayed when saving a contact photo failed. [CHAR LIMIT=NONE] -->

    <string name="contactPhotoSavedErrorToast">Couldn\'t save contact photo changes.</string>



    <!-- Toast displayed when something goes wrong while loading a label. [CHAR LIMIT=70] -->

    <string name="groupLoadErrorToast">Failed to load label</string>



    <!-- Toast displayed when a label is saved [CHAR LIMIT=30] -->

    <string name="groupSavedToast">Label saved</string>



    <!-- Toast displayed when a label name is updated. [CHAR LIMIT=50] -->

    <string name="groupCreatedToast">Label created</string>



    <!-- Toast displayed when a new label is created. [CHAR LIMIT=50] -->

    <string name="groupUpdatedToast">Label updated</string>



    <!-- 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 saving a label failed [CHAR LIMIT=70] -->

    <string name="groupSavedErrorToast">Couldn\'t save label changes.</string>
@@ -414,10 +429,10 @@ 
    <string name="dialog_new_group_account">Choose account</string>



    <!-- Title for the create new label dialog. CHAR LIMIT=40] -->

    <string name="create_group_dialog_title">Create label</string>

    <string name="insert_group_dialog_title">Create label</string>



    <!-- Button label to create a new label on the create new label dialog. [CHAR LIMIT=20] -->

    <string name="create_group_dialog_button">Create</string>

    <!-- Title for the update label dialog. CHAR LIMIT=40] -->

    <string name="update_group_dialog_title">Update label</string>



    <!-- Generic action string for starting an audio chat. Used by AccessibilityService to announce the purpose of the view. [CHAR LIMIT=NONE] -->

    <string name="audio_chat">Voice chat</string>

src/com/android/contacts/activities/GroupMembersActivity.java

+287 −258

File changed.

Preview size limit exceeded, changes collapsed.