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

Commit ac846d23 authored by xmao's avatar xmao
Browse files

Contacts: Commit recent RCS features updates. 

 - Limit profile name length.
 - Automatically show RCS user's phone number in "My Profile" screen.

Change-Id: I47504d4a064e2727246b77e203e224138467c2a8
parent 448e3801

res/layout/item_qrcode_data.xml

+12 −12
Original line number Diff line number Diff line
@@ -20,18 +20,19 @@ 
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS

 * IN THE SOFTWARE.

-->



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

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_marginLeft="10dip"

    android:orientation="horizontal" >



    <LinearLayout

        android:layout_width="300dp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentLeft="true"

        android:gravity="center_vertical"

        android:orientation="vertical" >

        android:orientation="vertical"

        android:layout_toLeftOf="@+id/checkbox">



        <TextView

            android:id="@+id/label"
@@ -40,30 +41,29 @@ 
            android:layout_marginLeft="50dp"

            android:layout_marginRight="10dp"

            android:layout_marginTop="10dp"

            android:layout_weight="1"

            android:maxWidth="150dp"

            android:singleLine="true"

            android:textSize="18dp" />



        <TextView

            android:id="@+id/data"

            android:layout_width="match_parent"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="10dp"

            android:layout_marginLeft="50dip"

            android:layout_marginTop="5dp"

            android:layout_weight="1"

            android:maxWidth="150dp"

            android:singleLine="true"

            android:textSize="15dp" />

            android:ellipsize="end"

            android:textSize="15dp"

           />

    </LinearLayout>



    <CheckBox

        android:id="@+id/checkbox"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_alignParentRight="true"

        android:layout_centerInParent="true"

        android:layout_marginRight="18dp"

        android:gravity="center_vertical" />



</LinearLayout>
 
 No newline at end of file
 
</RelativeLayout>

res/layout/rcs_contact_group_item.xml

+20 −17
Original line number Diff line number Diff line
@@ -24,31 +24,35 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:descendantFocusability="blocksDescendants"

    android:minHeight="@dimen/detail_min_line_item_height"

    android:orientation="vertical"

    android:paddingBottom="5dip"

    android:paddingLeft="?attr/list_item_padding_left"

    android:paddingStart="?attr/list_item_padding_left" >

    android:paddingLeft="@dimen/group_list_padding"

    android:paddingStart="@dimen/group_list_padding"

    android:paddingRight="@dimen/group_list_padding"

    android:paddingEnd="@dimen/group_list_padding" >



    <TextView

        android:id="@+id/title_view"

        android:layout_width="fill_parent"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="center_vertical"

        android:paddingBottom="5dip"

        android:paddingLeft="15dp"

        android:paddingTop="8dip"

        android:visibility="gone"

        android:ellipsize="middle"

        android:singleLine="true"

        android:textSize="14sp"

        android:textAllCaps="false"

        android:textDirection="ltr"

        android:textStyle="bold"

        android:text="@string/rcs_contact_group_item_grouplist"

        android:textAppearance="@style/DirectoryHeaderStyle"

        android:visibility="gone" />

        android:textAppearance="@style/DirectoryHeaderStyle" />



    <View

        android:id="@+id/divider"

        android:layout_width="match_parent"

        android:layout_height="1dip"

        android:layout_marginEnd="?attr/list_item_padding_right"

        android:layout_marginRight="?attr/list_item_padding_right"

        android:background="@color/secondary_header_separator_color" />



    <RelativeLayout
@@ -59,16 +63,14 @@ 
        android:descendantFocusability="blocksDescendants"

        android:duplicateParentState="true"

        android:paddingBottom="8dip"

        android:paddingLeft="8dip"

        android:paddingStart="8dip"

        android:paddingTop="8dip" >



        <View

            android:id="@+id/group_icon_view"

            android:layout_width="50dip"

            android:layout_height="50dip"

            android:layout_width="40dip"

            android:layout_height="40dip"

            android:layout_centerVertical="true"

            android:layout_marginLeft="10dip" />

            android:layout_marginLeft="0dip" />



        <LinearLayout

            android:layout_width="wrap_content"
@@ -84,7 +86,8 @@ 
                android:layout_height="wrap_content"

                android:ellipsize="end"

                android:singleLine="true"

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

                android:textColor="@color/group_name_text_color"

                android:textAppearance="@style/TextAppearanceMedium" />



            <TextView

                android:id="@+id/group_count"

res/values-zh-rCN/rcs_string.xml

+4 −1
Original line number Diff line number Diff line
@@ -95,4 +95,7 @@ 
    <string name="import_stop">"导入停止"</string>

    <string name="contact_backup_success">联系人备份成功</string>

    <string name="contact_backup_fail">联系人备份失败</string>

    <string name="first_name_max_length">姓氏不能超过二十个字节。</string>

    <string name="last_name_max_length">名字不能超过二十个字节。</string>

    <string name="full_name_max_length">姓名不能超过四十个字节。</string>

</resources>

res/values/rcs_string.xml

+5 −1
Original line number Diff line number Diff line
@@ -98,7 +98,11 @@ 
    <string name="rcs_updateting_enhance_screen">updating enhance screen...</string>

    <string name="btn_ok">Ok</string>

    <string name="btn_cancel">Cancel</string>

    <string name="rcs_network_uanvailable">network unvailable</string>

    <string name="import_stop">"Import stopped"</string>

    <string name="contact_backup_success">Contacts backup successfully!</string>

    <string name="contact_backup_fail">Contacts backup unsuccessfully!</string>

    <string name="first_name_max_length">the first name must not exceed 20 bytes.</string>

    <string name="last_name_max_length">the last name must not exceed 20 bytes.</string>

    <string name="full_name_max_length">the full name must not exceed 40 bytes.</string>

</resources>

src/com/android/contacts/ContactSaveService.java

+5 −1
Original line number Diff line number Diff line
@@ -283,8 +283,12 @@ public class ContactSaveService extends IntentService { 
            deleteContact(intent);

            if (RCSUtil.getRcsSupport() && RCSUtil.isNativeUiInstalled(this)

                    && RCSUtil.isPluginInstalled(this)) {

                Uri contactUri = intent.getParcelableExtra(EXTRA_CONTACT_URI);

                if (!TextUtils.isEmpty(contactUri.getPath())

                        && !contactUri.getPath().contains("profile")) {

                    RCSUtil.autoBackupOnceChanged(this);

                }

            }

        } else if (ACTION_JOIN_CONTACTS.equals(action)) {

            joinContacts(intent);

        } else if (ACTION_SET_SEND_TO_VOICEMAIL.equals(action)) {