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

Commit 9468f800 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 22086 into eclair 

* changes:
  Tweak the ContactsHeaderWidget to match the newest specs.
parents 75e6c771 c9e3e6e7

core/res/res/drawable/fasttrack_badge_middle.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2009 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:state_focused="false"

        android:state_selected="false"

        android:state_pressed="false"

        android:drawable="@drawable/fasttrack_badge_middle_normal" />



    <item

        android:state_pressed="true"

        android:drawable="@drawable/fasttrack_badge_middle_pressed" />



</selector>
 
 No newline at end of file

core/res/res/drawable/fasttrack_badge_middle_pressed.9.png

0 → 100644
+1.53 KiB
Loading image diff...

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

+3 −4
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 
        android:layout_height="wrap_content"

        android:singleLine="true"

        android:ellipsize="end"

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

    	android:textColor="@android:color/secondary_text_light"

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

        android:textStyle="bold"

        />



    <TextView android:id="@+id/phonetic_name"
@@ -36,8 +36,7 @@ 
        android:layout_height="wrap_content"

        android:singleLine="true"

        android:ellipsize="end"

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

    	android:textColor="@android:color/secondary_text_light"

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

        />



</LinearLayout>

core/res/res/layout/contact_header.xml

+12 −9
Original line number Diff line number Diff line
@@ -19,22 +19,23 @@ 
    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:background="@drawable/contact_header_bg"

    android:background="@drawable/title_bar_tall"

    android:paddingRight="5dip"

    android:gravity="center_vertical">

    

    <ImageView android:id="@+id/photo"

        android:layout_width="64dip"

        android:layout_width="56dip"

        android:layout_height="64dip"

        android:layout_marginRight="7dip"

        android:layout_marginLeft="2dip"

        android:layout_marginRight="10dip"

        android:layout_marginLeft="10dip"

        android:scaleType="fitCenter"

        android:background="@drawable/contact_picture_bg"/>

        android:background="@drawable/fasttrack_badge_middle"/>

    

    <LinearLayout

        android:layout_width="0dip"

        android:layout_height="fill_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_marginTop="5dip"

        android:orientation="vertical">



        <!-- "Name" field is locale-specific. -->
@@ -42,9 +43,11 @@ 


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

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:layout_height="0dip"

            android:layout_weight="1"

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

            android:maxLines="2"/>

            android:maxLines="2"

            android:ellipsize="end"/>

                

    </LinearLayout>