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

Commit d4fe8f62 authored by The Android Automerger's avatar The Android Automerger
Browse files

merge in klp-factoryrom-release history after reset to klp-release

parent d15deaf5

res-common/layout/directory_header.xml

+6 −6
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ 
        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
@@ -42,10 +40,11 @@ 
            android:layout_height="wrap_content"

            android:layout_marginLeft="8dip"

            android:layout_marginStart="8dip"

            android:textSize="20sp"

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

            android:textColor="@color/people_app_theme_color"

            android:singleLine="true"

            android:fontFamily="sans-serif-light"

            android:textStyle="bold"

            android:textAllCaps="true"

            android:textAlignment="viewStart" />

        <TextView

            android:id="@+id/display_name"
@@ -55,10 +54,11 @@ 
            android:layout_marginRight="8dip"

            android:layout_marginStart="8dip"

            android:layout_marginEnd="8dip"

            android:textSize="20sp"

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

            android:textColor="@color/people_app_theme_color"

            android:singleLine="true"

            android:fontFamily="sans-serif-light"

            android:textStyle="bold"

            android:textAllCaps="true"

            android:textAlignment="viewStart" />

        <TextView

            android:id="@+id/count"

res-common/values/styles.xml

+4 −10
Original line number Diff line number Diff line
@@ -20,13 +20,7 @@ 
        <item name="android:background">@android:color/transparent</item>

    </style>





    <style name="SectionHeaderStyle" parent="@android:style/TextAppearance.Large">

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

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

    </style>



    <!-- TextView style used for headers.

    <!-- TextView style with blue underline. It is most suitable for headers.



This is similar to ?android:attr/listSeparatorTextView but uses different

background and text color. See also android:style/Widget.Holo.TextView.ListSeparator
@@ -37,12 +31,12 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar 
        <!-- See comments for @dimen/list_section_divider_min_height -->

        <item name="android:minHeight">@dimen/list_section_divider_min_height</item>

        <item name="android:background">@drawable/list_section_divider_holo_custom</item>

        <item name="android:textAppearance">@style/SectionHeaderStyle</item>

        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>

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

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

        <item name="android:gravity">center_vertical</item>

        <item name="android:paddingLeft">8dip</item>

        <item name="android:paddingStart">8dip</item>

        <item name="android:paddingTop">4dip</item>

        <item name="android:paddingBottom">4dip</item>

        <item name="android:ellipsize">end</item>

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

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