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

Commit 6ecacd40 authored by Neel Parekh's avatar Neel Parekh
Browse files

Center name when no status. 

Also shows the status if exists (not actually hooked up yet though).

Bug: 21387361
parent 48c84052

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

+7 −1
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList 
        mPresenceView = (ImageView) findViewById(R.id.presence);



        mStatusView = (TextView)findViewById(R.id.status);

        setSocialSnippet(null);



        // Set the photo with a random "no contact" image

        long now = SystemClock.elapsedRealtime();
@@ -355,7 +356,12 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList 
     * Manually set the social snippet text to display in the header.

     */

    public void setSocialSnippet(CharSequence snippet) {

        if (snippet == null) {

            mStatusView.setVisibility(View.GONE);

        } else {

            mStatusView.setText(snippet);

            mStatusView.setVisibility(View.VISIBLE);

        }

    }



    /**

core/res/res/layout-ja/contact_header_name.xml

+5 −5
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ 
    android:orientation="vertical"

    android:layout_width="0dip"

    android:layout_weight="1"

    android:layout_height="wrap_content">

    android:layout_height="fill_parent">



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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent"

        android:singleLine="true"

        android:ellipsize="end"

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

core/res/res/layout/contact_header.xml

+15 −14
Original line number Diff line number Diff line
@@ -17,15 +17,14 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/banner"

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:layout_height="fill_parent"

    android:orientation="horizontal"

    android:background="@drawable/title_bar_medium"

    android:paddingRight="5dip"

    android:gravity="center_vertical">

    android:paddingRight="5dip">



    <android.widget.FasttrackBadgeWidget android:id="@+id/photo"

        android:layout_alignParentLeft="true"

        android:layout_centerVertical="true"

        android:layout_gravity="center_vertical"

        android:layout_marginRight="10dip"

        android:layout_marginLeft="10dip"

        style="@*android:style/Widget.FasttrackBadgeWidget.WindowSmall" />
@@ -35,8 +34,9 @@ 
        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginTop="5dip"

        android:orientation="vertical">



        android:orientation="vertical"

        android:layout_gravity="center_vertical" >



        <LinearLayout

            android:layout_width="fill_parent"
@@ -59,8 +59,7 @@ 


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

            android:layout_width="fill_parent"

            android:layout_height="0dip"

            android:layout_weight="1"

            android:layout_height="wrap_content"

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

            android:maxLines="2"

            android:ellipsize="end"/>
@@ -71,6 +70,7 @@ 
        android:id="@+id/presence"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:paddingLeft="3dip"

        android:paddingRight="6dip"/>
@@ -78,6 +78,7 @@ 
        android:id="@+id/star"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:visibility="gone"

        style="?android:attr/starStyle" />

core/res/res/layout/contact_header_name.xml

+3 −2
Original line number Diff line number Diff line
@@ -23,4 +23,5 @@ 
    android:textStyle="bold"

    android:singleLine="true"

    android:ellipsize="end"

    android:layout_gravity="center_vertical"

    />