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

Commit 3e5ae0db authored by Walter Jang's avatar Walter Jang
Browse files

Show all aggreagate contact names on the editor 

Stop copying the name from read only contacts
to the new raw contact created in order to enable
editing of read only contacts. We also don't need to
match the name displayed by quick contacts.
In the new design, we are showing multiple names with
read-only accounts marked with the account type icon
and name.

Bug 23589603

Change-Id: Ifd8d18b17fc9645c15814bbb1a649a82fe246bbd
parent 28a27279

res/layout/account_type_info.xml

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

<!--

  Copyright (C) 2015 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.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



<LinearLayout

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

        android:id="@+id/account_type"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:visibility="gone">



    <ImageView

            android:id="@+id/account_type_icon"

            style="@style/AccountTypeIconStyle" />



    <TextView

            android:id="@+id/account_type_name"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            style="@style/AccountTypeNameStyle" />



</LinearLayout>
 
 No newline at end of file

res/layout/compact_contact_editor_fields.xml

+0 −7
Original line number Diff line number Diff line
@@ -17,13 +17,6 @@ 


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



    <LinearLayout

            android:id="@+id/names"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/editor_compact_first_field_padding"

            android:orientation="vertical"/>



    <LinearLayout

            android:id="@+id/kind_section_views"

            android:layout_width="match_parent"

res/layout/structured_name_editor_view.xml

+39 −30
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ 


<com.android.contacts.editor.StructuredNameEditorView

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="@dimen/editor_min_line_item_height"
@@ -50,4 +55,8 @@ 
            layout="@layout/edit_delete_button"

            android:visibility="gone" />



    </LinearLayout>



    <include layout="@layout/account_type_info"/>



</com.android.contacts.editor.StructuredNameEditorView>

res/values/styles.xml

+13 −0
Original line number Diff line number Diff line
@@ -325,4 +325,17 @@ 
        <item name="android:layout_marginEnd">28dp</item>

        <item name="android:layout_marginTop">@dimen/editor_kind_icon_top_margin</item>

    </style>



    <style name="AccountTypeIconStyle">

        <item name="android:layout_width">12dp</item>

        <item name="android:layout_height">12dp</item>

        <item name="android:layout_marginStart">2dp</item>

        <item name="android:layout_marginEnd">4dp</item>

    </style>



    <style name="AccountTypeNameStyle">

        <item name="android:textSize">10sp</item>

        <item name="android:textColor">#363636</item>

        <item name="android:fontFamily">sans-serif</item>

    </style>

</resources>

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

+1 −2
Original line number Diff line number Diff line
@@ -449,8 +449,7 @@ public class ContactSelectionActivity extends ContactsActivity 
            } else {

                // Otherwise launch the full contact editor.

                startActivityAndForwardResult(EditorIntents.createEditContactIntent(

                        contactLookupUri, /* materialPalette =*/ null, /* photoId =*/ -1,

                        /* nameId =*/ -1));

                        contactLookupUri, /* materialPalette =*/ null, /* photoId =*/ -1));

            }

        }