Merge change 21162

* changes:
  more support for bindStatic some minor tweaks to the layout in the hopes I can start using this for gtalk soon

2 files changed, 16 insertions, 13 deletions

diff --git a/core/java/com/android/internal/widget/ContactHeaderWidget.java b/core/java/com/android/internal/widget/ContactHeaderWidget.java
index 85f7ae8..30349b3 100644
--- a/core/java/com/android/internal/widget/ContactHeaderWidget.java
+++ b/core/java/com/android/internal/widget/ContactHeaderWidget.java
@@ -27,6 +27,7 @@ import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Message;
@@ -251,6 +252,20 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
     }
 
     /**
+     * Manually set the presence.
+     */
+    public void setPresence(int presence) {
+        mPresenceView.setImageResource(Presence.getPresenceIconResourceId(presence));
+    }
+
+    /**
+     * Manually set the contact uri
+     */
+    public void setContactUri(Uri uri) {
+        mContactUri = uri;
+    }
+
+    /**
      * Manually set the photo to display in the header. This doesn't change the
      * underlying {@link Contacts}, only the UI state.
      */
@@ -364,18 +379,6 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
     }
 
     /**
-     * @deprecated use {@link #setDisplayName(CharSequence, CharSequence)} and
-     *             {@link #setSocialSnippet(CharSequence)} instead.
-     */
-    @Deprecated
-    public void bindStatic(String main, String secondary) {
-        mDisplayNameView.setText(main);
-        mStatusView.setText(secondary);
-        mStarredView.setVisibility(View.GONE);
-        mPhotoView.setImageBitmap(loadPlaceholderPhoto(null));
-    }
-
-    /**
      * Bind the contact details provided by the given {@link Cursor}.
      */
     protected void bindContactInfo(Cursor c) {
diff --git a/core/res/res/layout/contact_header_name.xml b/core/res/res/layout/contact_header_name.xml
index 77751c3..9039702 100644
--- a/core/res/res/layout/contact_header_name.xml
+++ b/core/res/res/layout/contact_header_name.xml
@@ -19,7 +19,7 @@
     android:id="@+id/name"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceLargeInverse"
+    android:textAppearance="?android:attr/textAppearanceMediumInverse"
     android:textColor="@android:color/secondary_text_light"
     android:singleLine="true"
     android:ellipsize="end"