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

Commit 8bbf2250 authored by Nancy Chen's avatar Nancy Chen Committed by Android (Google) Code Review
Browse files

Merge "Change style for directory headers in Dialer search results" into lmp-dev

parents ccb3c2d2 b2580c55

res-common/layout/directory_header.xml

+25 −39
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->



<!-- Layout used for list section separators. -->

<FrameLayout

<LinearLayout

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

    style="@style/DirectoryHeader"

    android:id="@+id/directory_header"
@@ -24,23 +24,15 @@ 
    android:paddingRight="?attr/list_item_padding_right"

    android:paddingStart="?attr/list_item_padding_left"

    android:paddingEnd="?attr/list_item_padding_right"

    android:paddingTop="@dimen/directory_header_extra_top_padding"

    android:minHeight="@dimen/list_section_divider_min_height"

    android:layout_marginTop="@dimen/list_header_extra_top_padding"

    android:layout_width="match_parent"

    android:layout_height="wrap_content" >

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_vertical"

        android:paddingTop="4dp"

        android:paddingBottom="8dp"

        android:background="@drawable/list_section_divider_holo_custom" >

    <TextView

        android:id="@+id/label"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

            android:layout_marginLeft="8dip"

            android:layout_marginStart="8dip"

        android:textAppearance="@style/DirectoryHeaderStyle"

        android:singleLine="true"

        android:textAlignment="viewStart" />
@@ -48,10 +40,7 @@ 
        android:id="@+id/display_name"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

            android:layout_marginLeft="8dip"

            android:layout_marginRight="8dip"

            android:layout_marginStart="8dip"

            android:layout_marginEnd="8dip"

        android:layout_marginStart="8dp"

        android:textAppearance="@style/DirectoryHeaderStyle"

        android:singleLine="true"

        android:textAlignment="viewStart" />
@@ -60,10 +49,7 @@ 
        android:paddingTop="1dip"

        android:layout_width="0dip"

        android:layout_height="wrap_content"

            android:layout_weight="1"

        android:gravity="end"

        android:singleLine="true"

            android:textSize="12sp"

            android:textColor="@color/people_app_theme_color" />

        android:textAppearance="@style/DirectoryHeaderStyle" />

</LinearLayout>
 
</FrameLayout>

res-common/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
         This value is for making the hidden configuration explicit in xml. -->

    <dimen name="list_section_divider_min_height">32dip</dimen>



    <dimen name="directory_header_extra_top_padding">12dp</dimen>



    <!--  Horizontal padding in between contact tiles -->

    <dimen name="contact_tile_divider_padding">23dip</dimen>

    <!--  Horizontal padding before the first tile and after the last tile -->

res-common/values/styles.xml

+2 −4
Original line number Diff line number Diff line
@@ -29,10 +29,8 @@ 


    <style name="DirectoryHeaderStyle" parent="@android:style/TextAppearance.Small">

        <item name="android:textSize">14sp</item>

        <item name="android:textStyle">bold</item>

        <item name="android:textAllCaps">true</item>

        <item name="android:textColor">@color/people_app_theme_color</item>

        <item name="android:fontFamily">sans-serif</item>

        <item name="android:textColor">@color/dialtacts_secondary_text_color</item>

        <item name="android:fontFamily">sans-serif-medium</item>

    </style>



    <!-- TextView style used for headers.