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

Commit 7eeb9c23 authored by Daniel Lehmann's avatar Daniel Lehmann Committed by Android Git Automerger
Browse files

am 3e9032e6: Merge "Increase name-label height so that "g" isn\'t cut off... 

am 3e9032e6: Merge "Increase name-label height so that "g" isn\'t cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:2542703 Bug:2549485" into froyo

Merge commit '3e9032e6' into kraken

* commit '3e9032e6':
  Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts
parents 462e4a90 3e9032e6

core/java/com/android/internal/widget/ContactHeaderWidget.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -175,7 +175,6 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList 




        mDisplayNameView = (TextView) findViewById(R.id.name);

        mDisplayNameView = (TextView) findViewById(R.id.name);

        mAggregateBadge = findViewById(R.id.aggregate_badge);

        mAggregateBadge = findViewById(R.id.aggregate_badge);

        mAggregateBadge.setVisibility(View.GONE);





        mPhoneticNameView = (TextView) findViewById(R.id.phonetic_name);

        mPhoneticNameView = (TextView) findViewById(R.id.phonetic_name);

core/res/res/layout/contact_header.xml

+7 −2
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ 
                android:paddingRight="3dip"

                android:paddingRight="3dip"

                android:paddingTop="3dip"

                android:paddingTop="3dip"

                android:src="@drawable/ic_aggregated"

                android:src="@drawable/ic_aggregated"

                android:visibility="gone"

            />

            />





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

            <TextView android:id="@+id/name"
@@ -59,7 +60,6 @@ 
                android:textStyle="bold"

                android:textStyle="bold"

                android:shadowColor="#BB000000"

                android:shadowColor="#BB000000"

                android:shadowRadius="2.75"

                android:shadowRadius="2.75"

                android:layout_marginBottom="-4dip"

                />

                />

        </LinearLayout>

        </LinearLayout>
@@ -70,6 +70,7 @@ 
            android:singleLine="true"

            android:singleLine="true"

            android:ellipsize="end"

            android:ellipsize="end"

            android:layout_marginTop="-2dip"

            android:layout_marginTop="-2dip"

            android:visibility="gone"

        />

        />





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

        <TextView android:id="@+id/status"
@@ -79,6 +80,7 @@ 
            android:singleLine="true"

            android:singleLine="true"

            android:ellipsize="end"

            android:ellipsize="end"

            android:layout_marginTop="-2dip"

            android:layout_marginTop="-2dip"

            android:visibility="gone"

        />

        />





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

        <TextView android:id="@+id/status_date"
@@ -88,6 +90,7 @@ 
            android:textAppearance="?android:attr/textAppearanceSmall"

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

            android:textSize="12sp"

            android:textSize="12sp"

            android:layout_marginTop="-2dip"

            android:layout_marginTop="-2dip"

            android:visibility="gone"

        />

        />

    </LinearLayout>

    </LinearLayout>
@@ -97,7 +100,9 @@ 
        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_gravity="center_vertical"

        android:paddingLeft="3dip"

        android:paddingLeft="3dip"

        android:paddingRight="6dip"/>

        android:paddingRight="6dip"

        android:visibility="gone"

    />





    <CheckBox

    <CheckBox

        android:id="@+id/star"

        android:id="@+id/star"