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

Commit 5297c6af authored by Jeff Hamilton's avatar Jeff Hamilton
Browse files

New edit UI, now without tabs. 

Make ExternalSource derive from FallbackSource
and add photo and name to the list of sources
since they're not optional.

Change-Id: I043db076a001a711e56dd6e5e6ee32c4c0c9477a
parent 735e8b11

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ 
        <!-- Edit or insert details for a contact -->

        <activity

            android:name=".ui.EditContactActivity"

            android:theme="@style/TallTitleBarTheme"

            android:label="@string/editContactDescription"

            android:windowSoftInputMode="stateVisible|adjustResize">



            <intent-filter android:label="@string/editContactDescription">

res/layout/act_edit.xml

+33 −45
Original line number Diff line number Diff line
@@ -14,60 +14,48 @@ 
     limitations under the License.

-->



<ScrollView

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

    android:layout_width="fill_parent"

    android:layout_height="fill_parent"

    android:fillViewport="true">



    <LinearLayout

        android:id="@+id/panel"

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

    android:layout_width="fill_parent"

    android:layout_height="fill_parent"

    android:orientation="vertical"

        android:fillViewport="true">

>



        <com.android.internal.widget.ContactHeaderWidget

            android:id="@+id/contact_header_widget"

    <ScrollView 

        android:layout_width="fill_parent"

            android:layout_height="wrap_content" />

        android:layout_height="1px"

        android:layout_weight="1"

        android:fillViewport="true"

    >



        <com.android.contacts.ScrollingTabWidget

            android:id="@+id/tab_widget"

        <LinearLayout android:id="@+id/editors"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content" />

            android:layout_height="fill_parent"

            android:orientation="vertical"

        />



        <include

            android:id="@android:id/tabcontent"

            android:layout_width="fill_parent"

            android:layout_height="0dip"

            android:layout_weight="1"

            android:fillViewport="true"

            android:visibility="invisible"

            layout="@layout/item_contact_editor" />

    </ScrollView>



    <LinearLayout

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

            style="@android:style/ButtonBar">

        style="@android:style/ButtonBar"

    >



            <Button

                android:id="@+id/btn_done"

        <Button android:id="@+id/btn_done"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1"

                android:text="@string/menu_done" />

            android:text="@string/menu_done"

        />



            <Button

                android:id="@+id/btn_discard"

        <Button android:id="@+id/btn_discard"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1"

                android:text="@string/menu_doNotSave" />

            android:text="@string/menu_doNotSave"

        />



    </LinearLayout>



</LinearLayout>
 


</ScrollView>

res/layout/item_contact_editor.xml

+126 −64
Original line number Diff line number Diff line
@@ -18,24 +18,68 @@ 
<com.android.contacts.ui.widget.ContactEditorView

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

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:orientation="horizontal"

>



    <!-- Left side color bar -->

    <ImageView

        android:id="@+id/color_bar"

        android:layout_width="15dip"

        android:layout_height="fill_parent"

    android:fillViewport="true">

    />



    <TextView

        android:id="@+id/edit_read_only"

    <!-- The content -->

    <RelativeLayout

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

    >



        <!-- Account info header -->

        <RelativeLayout android:id="@+id/header"

            android:layout_height="64dip"

            android:layout_width="fill_parent"

        >



            <ImageView android:id="@+id/header_icon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

        android:gravity="center|center_vertical"

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

        android:paddingTop="5dip"

        android:paddingBottom="5dip"

        android:text="@string/edit_read_only"/>

                android:layout_marginLeft="7dip"

                android:layout_marginRight="7dip"

                android:layout_centerVertical="true"

            />



            <TextView android:id="@+id/header_account_type"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_toRightOf="@+id/header_icon"

                android:layout_alignTop="@id/header_icon"

                android:layout_marginTop="-4dip"



                android:textSize="24pt"

                android:textStyle="bold"

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

            />



            <TextView android:id="@+id/header_account_name"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_toRightOf="@+id/header_icon"

                android:layout_alignBottom="@+id/header_icon"

                android:layout_marginBottom="2dip"



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

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

            />



        </RelativeLayout>



        <FrameLayout

            android:id="@+id/stub_photo"

            android:layout_width="100dip"

            android:layout_height="96dip"

        android:layout_below="@id/edit_read_only"

            android:layout_below="@id/header"

            android:layout_alignWithParentIfMissing="true"

            android:paddingLeft="12dip"

            android:paddingTop="10dip">
@@ -50,8 +94,7 @@ 
            android:id="@+id/edit_name"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

        android:layout_below="@id/edit_read_only"

        android:layout_toRightOf="@id/stub_photo"

            android:layout_below="@id/stub_photo"

            android:layout_marginTop="6dip"

            android:layout_marginBottom="4dip"

            android:layout_alignWithParentIfMissing="true"
@@ -62,16 +105,23 @@ 
            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:layout_below="@+id/edit_name"

        android:orientation="vertical" />

            android:orientation="vertical"

        />



        <View android:id="@+id/head_secondary_divider"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:layout_below="@id/sect_general"

            android:background="?android:attr/listDivider" />



        <TextView

            android:id="@+id/head_secondary"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

        android:layout_below="@+id/sect_general"

            android:layout_below="@+id/head_secondary_divider"



            android:gravity="center_vertical"

            android:minHeight="?android:attr/listPreferredItemHeight"

        android:background="@color/sect_secondary"

            android:text="@string/edit_secondary_collapse"

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

            android:textColor="@color/kind_title"
@@ -86,8 +136,20 @@ 
            android:id="@+id/sect_secondary"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

        android:layout_below="@+id/head_secondary"

        android:background="@color/sect_secondary"

            android:layout_below="@id/head_secondary"

            android:orientation="vertical" />



        <TextView

            android:id="@+id/edit_read_only"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:layout_below="@id/edit_name"

            android:gravity="center_horizontal"

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

            android:paddingTop="5dip"

            android:paddingBottom="5dip"

            android:text="@string/edit_read_only"/>



    </RelativeLayout>



</com.android.contacts.ui.widget.ContactEditorView>

res/layout/item_generic_editor.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


<com.android.contacts.ui.widget.GenericEditorView

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

    android:layout_width="fill_parent"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:baselineAligned="false"

    android:paddingRight="?android:attr/scrollbarSize">

res/menu/edit.xml

+0 −10
Original line number Diff line number Diff line
@@ -37,16 +37,6 @@ 
        android:icon="@android:drawable/ic_menu_delete"

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



    <item

        android:id="@+id/menu_photo_add"

        android:icon="@drawable/ic_menu_add_picture"

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



    <item

        android:id="@+id/menu_photo_remove"

        android:icon="@android:drawable/ic_menu_delete"

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



    <item

        android:id="@+id/menu_split"

        android:icon="@drawable/ic_menu_merge"