Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '3e9032e646c898a725c256c90031494cc349eea0' into kraken

* commit '3e9032e646c898a725c256c90031494cc349eea0':
  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
This commit is contained in:
Daniel Lehmann
2010-03-29 10:37:41 -07:00
committed by Android Git Automerger
parent 462e4a900a 3e9032e646
commit 7eeb9c2382
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/com/android/internal/widget/ContactHeaderWidget.java
View File

@@ -175,7 +175,6 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
mDisplayNameView = (TextView) findViewById(R.id.name);
mAggregateBadge = findViewById(R.id.aggregate_badge);
mAggregateBadge.setVisibility(View.GONE);
mPhoneticNameView = (TextView) findViewById(R.id.phonetic_name);

9
core/res/res/layout/contact_header.xml
View File

@@ -48,6 +48,7 @@
android:paddingRight="3dip"
android:paddingTop="3dip"
android:src="@drawable/ic_aggregated"
android:visibility="gone"
/>
<TextView android:id="@+id/name"
@@ -59,7 +60,6 @@
android:textStyle="bold"
android:shadowColor="#BB000000"
android:shadowRadius="2.75"
android:layout_marginBottom="-4dip"
/>
</LinearLayout>
@@ -70,6 +70,7 @@
android:singleLine="true"
android:ellipsize="end"
android:layout_marginTop="-2dip"
android:visibility="gone"
/>
<TextView android:id="@+id/status"
@@ -79,6 +80,7 @@
android:singleLine="true"
android:ellipsize="end"
android:layout_marginTop="-2dip"
android:visibility="gone"
/>
<TextView android:id="@+id/status_date"
@@ -88,6 +90,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:textSize="12sp"
android:layout_marginTop="-2dip"
android:visibility="gone"
/>
</LinearLayout>
@@ -97,7 +100,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingLeft="3dip"
android:paddingRight="6dip"/>
android:paddingRight="6dip"
android:visibility="gone"
/>
<CheckBox
android:id="@+id/star"