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

Commit de1dd3e1 authored by blong's avatar blong Committed by Steve Kondik
Browse files

Re-merge upstream features 

Add contacts group feature

- Restore group tab which deleted by google
- Add local group feature

Change-Id: Ic5a2a801425c9549108e494d569f6fef99752c2c

Add the support to insert contacts to phone/SIM card

- Add one menu to copy contacts from phone to SIM card,and auto split
  contacts according to the numbers of phone and email.
- Add one menu to copy contacts from SIM card to phone.

Change-Id: If3e61c32098b0e6bd46861b3edef5a8c59c99c38
parent 9f3cdb65

res/layout-land/group_editor_view.xml

+20 −3
Original line number Diff line number Diff line
@@ -52,9 +52,26 @@ 
            android:paddingStart="8dip"

            android:orientation="vertical"

            >

            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal">

                <include

                    layout="@layout/group_editor_autocomplete_view"

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



                <ImageView

                    android:id="@+id/addGroupMember"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:cropToPadding="true"

                    android:scaleType="centerCrop"

                    android:src="@drawable/ic_add_contact_holo_light"

                    android:background="?android:attr/selectableItemBackground"

                    android:gravity="start"

                    android:layout_gravity="center"/>

            </LinearLayout>



            <include

                layout="@layout/group_editor_existing_member_list"

                android:id="@android:id/list"/>

res/layout-sw600dp/group_editor_view.xml

+18 −3
Original line number Diff line number Diff line
@@ -63,10 +63,25 @@ 
            layout="@layout/editor_account_header"

            android:visibility="invisible"/>



        <LinearLayout android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal">

	        <include

	            layout="@layout/group_editor_autocomplete_view"

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



	        <ImageView

	            android:id="@+id/addGroupMember"

	            android:layout_width="wrap_content"

	            android:layout_height="wrap_content"

	            android:cropToPadding="true"

	            android:scaleType="centerCrop"

	            android:src="@drawable/ic_add_contact_holo_light"

	            android:background="?android:attr/selectableItemBackground"

	            android:gravity="start"

	            android:layout_gravity="center"/>

        </LinearLayout>



        <include

            layout="@layout/group_editor_existing_member_list"

            android:id="@android:id/list"/>

res/layout/group_browse_list_fragment.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">

    android:orientation="vertical"

    android:background="@color/group_list_background_color">



    <!-- See group_browse_list_item.xml for the reason for the transparent android:listSelector -->

    <view

res/layout/group_editor_autocomplete_view.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 


<AutoCompleteTextView

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

    android:layout_width="match_parent"

    android:layout_width="0dip"

    android:layout_weight="1"

    android:layout_height="wrap_content"

    android:textAppearance="?android:attr/textAppearanceMedium"

    android:textColor="?android:attr/textColorPrimary"

res/layout/group_editor_view.xml

+18 −3
Original line number Diff line number Diff line
@@ -44,10 +44,25 @@ 
            android:paddingLeft="8dip"

            android:paddingStart="8dip"/>



        <LinearLayout android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal">

	        <include

	            layout="@layout/group_editor_autocomplete_view"

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



	        <ImageView

	            android:id="@+id/addGroupMember"

	            android:layout_width="wrap_content"

	            android:layout_height="wrap_content"

	            android:cropToPadding="true"

	            android:scaleType="centerCrop"

	            android:src="@drawable/ic_add_contact_holo_light"

	            android:background="?android:attr/selectableItemBackground"

	            android:gravity="start"

	            android:layout_gravity="center"/>

        </LinearLayout>



        <include

            layout="@layout/group_editor_existing_member_list"

            android:id="@android:id/list"/>