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

Commit 803c2ed6 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 24893 into eclair 

* changes:
  More call log and favorites list UI changes.
parents b77a6d9f 156546a4

res/layout-finger/contacts_list_item.xml

+31 −22
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
        android:layout_width="fill_parent"

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

        android:paddingLeft="14dip"

        android:paddingRight="5dip"

    >



        <ImageView android:id="@+id/presence"
@@ -99,15 +98,25 @@ 
        />



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

	        android:layout_width="50dip"

	        android:layout_height="50dip"

	        android:layout_marginLeft="9dip"

            android:layout_width="wrap_content"

            android:layout_height="fill_parent"

            android:paddingLeft="14dip"

            android:paddingRight="14dip"

            android:layout_alignParentRight="true"

            android:layout_centerVertical="true"



            android:gravity="center"

            android:src="@android:drawable/sym_action_call"

	        android:background="@drawable/list_item_secondary_button"

            android:background="@android:drawable/list_selector_background"

        />



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

            android:layout_width="1dip"

            android:layout_height="fill_parent"

            android:layout_toLeftOf="@id/call_button"

            android:layout_marginLeft="11dip"



            android:background="@drawable/divider_vertical_dark"

        />



    </RelativeLayout>

res/layout-finger/contacts_list_item_photo.xml

+32 −23
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
        android:layout_width="fill_parent"

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

        android:paddingLeft="5dip"

        android:paddingRight="5dip"

    >



        <ImageView android:id="@+id/presence"
@@ -105,15 +104,25 @@ 
        />



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

	        android:layout_width="50dip"

	        android:layout_height="50dip"

	        android:layout_marginLeft="9dip"

            android:layout_width="wrap_content"

            android:layout_height="fill_parent"

            android:paddingLeft="14dip"

            android:paddingRight="14dip"

            android:layout_alignParentRight="true"

            android:layout_centerVertical="true"



            android:gravity="center"

            android:src="@android:drawable/sym_action_call"

	        android:background="@drawable/list_item_secondary_button"

            android:background="@android:drawable/list_selector_background"

        />



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

            android:layout_width="1dip"

            android:layout_height="fill_parent"

            android:layout_toLeftOf="@id/call_button"

            android:layout_marginLeft="11dip"



            android:background="@drawable/divider_vertical_dark"

        />



    </RelativeLayout>

res/layout-finger/recent_calls_list_item.xml

+29 −22
Original line number Diff line number Diff line
@@ -17,35 +17,43 @@ 
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="fill_parent"

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

    android:paddingLeft="9dip"

    android:paddingRight="9dip"

    android:paddingLeft="7dip"

>



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

        android:layout_width="50dip"

        android:layout_height="50dip"

        android:layout_marginLeft="9dip"

        android:layout_width="wrap_content"

        android:layout_height="fill_parent"

        android:paddingLeft="14dip"

        android:paddingRight="14dip"

        android:layout_alignParentRight="true"

        android:layout_centerVertical="true"



        android:gravity="center"

        android:gravity="center_vertical"

        android:src="@android:drawable/sym_action_call"

        android:background="@drawable/list_item_secondary_button"

        android:background="@android:drawable/list_selector_background"

    />



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

        android:layout_width="1dip"

        android:layout_height="fill_parent"

        android:layout_toLeftOf="@id/call_icon"

        android:layout_marginLeft="11dip"



        android:background="@drawable/divider_vertical_dark"

    />



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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_toLeftOf="@id/call_icon"

        android:layout_alignParentTop="true"

        android:layout_toLeftOf="@id/divider"

    />



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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_toLeftOf="@id/divider"

        android:layout_alignParentBottom="true"

        android:layout_toLeftOf="@id/call_icon"

        android:layout_marginBottom="9dip"

        android:layout_marginBottom="8dip"



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

        android:singleLine="true"
@@ -54,6 +62,7 @@ 
    <TextView android:id="@+id/label"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentLeft="true"

        android:layout_alignParentBottom="true"

        android:layout_marginBottom="8dip"

        android:layout_marginTop="-10dip"
@@ -69,7 +78,6 @@ 
        android:layout_height="wrap_content"

        android:layout_marginLeft="5dip"

        android:layout_toRightOf="@id/label"

        android:layout_toLeftOf="@id/date"

        android:layout_alignBaseline="@id/label"

        android:layout_alignWithParentIfMissing="true"
@@ -78,12 +86,11 @@ 
        android:textAppearance="?android:attr/textAppearanceSmall"

    />





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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:layout_alignParentLeft="true"

        android:layout_alignParentTop="true"

        android:layout_above="@id/label"

        android:layout_alignWithParentIfMissing="true"

src/com/android/contacts/ContactsListActivity.java

+22 −5
Original line number Diff line number Diff line
@@ -584,11 +584,28 @@ public final class ContactsListActivity extends ListActivity implements 
    }



    /** {@inheritDoc} */

    public void onClick(View view) {

    public void onClick(View v) {



        switch (v.getId()) {

            case R.id.call_button: {

                final int position = (Integer) v.getTag();

                Cursor c =  (Cursor) mAdapter.getItem(position);

                if (c != null) {

                    callContact(c);

                }

                break;

            }



            case R.id.photo: {

                // Clicked on photo, so show fast-track

        final PhotoInfo info = (PhotoInfo)view.getTag();

        final Uri contactUri = getContactUri(info.position);

        showFastTrack(view, contactUri);

                final PhotoInfo info = (PhotoInfo) v.getTag();

                final int position = info.position;

                final Uri contactUri = getContactUri(position);

                showFastTrack(v, contactUri);

                break;

            }

        }



    }



    private void setEmptyText() {