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

Commit fc816828 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Contacts: fix UI glitches" into gingerbread

parents 5c0c0bb3 726e6618

res/layout-finger/recent_calls_list_group_item.xml

+16 −20
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ 
        android:layout_marginLeft="4dip"

    />





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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"
@@ -66,18 +65,31 @@ 
        android:singleLine="true"

    />

    

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

    <ImageView

        android:id="@+id/groupIndicator"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_toRightOf="@id/photo"

        android:layout_alignWithParentIfMissing="true"

        android:layout_marginLeft="2dip"



        android:layout_centerVertical="true"

        android:src="@*android:drawable/expander_ic_minimized"

        android:gravity="center_vertical"

    />



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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_toRightOf="@id/groupIndicator"

        android:layout_alignParentBottom="true"

        android:layout_marginBottom="8dip"

        android:layout_marginTop="-10dip"

        android:layout_marginLeft="10dip"

        android:layout_marginLeft="2dip"

        android:layout_marginRight="8dip"

        android:layout_alignWithParentIfMissing="true"



        android:singleLine="true"

        android:ellipsize="marquee"

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

        android:textStyle="bold"

    />
@@ -120,22 +132,6 @@ 
        style="@*android:style/Widget.QuickContactBadge.WindowMedium"

    />



    <ImageView

        android:id="@+id/groupIndicator"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:layout_toRightOf="@id/photo"

        android:layout_above="@id/date"

        android:layout_alignWithParentIfMissing="true"

        android:layout_marginBottom="-10dip"

        android:layout_marginLeft="2dip"



        android:layout_centerVertical="true"

        android:src="@*android:drawable/expander_ic_minimized"

        android:gravity="center_vertical"

    />



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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

res/layout-finger/recent_calls_list_item_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -57,11 +57,11 @@ 
        android:layout_alignParentBottom="true"

        android:layout_marginBottom="8dip"

        android:layout_marginTop="-10dip"

        android:layout_marginLeft="10dip"

        android:layout_marginLeft="4dip"

        android:layout_marginRight="8dip"

        android:layout_alignWithParentIfMissing="true"



        android:singleLine="true"

        android:ellipsize="marquee"

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

        android:textStyle="bold"

    />

src/com/android/contacts/RecentCallsListActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -799,7 +799,7 @@ public class RecentCallsListActivity extends ListActivity 


            if (!TextUtils.isEmpty(name)) {

                views.line1View.setText(name);

                views.labelView.setVisibility(View.VISIBLE);

                views.line1View.setVisibility(View.VISIBLE);



                // "type" and "label" are currently unused for SIP addresses.

                CharSequence numberLabel = null;