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

Commit 05d1d08f authored by Evan Severson's avatar Evan Severson Committed by Android (Google) Code Review
Browse files

Merge "[SettingsLib] Extract attributes for entity header into styles" into main

parents 3e86ab6f 3506e68a

packages/SettingsLib/LayoutPreference/res/layout/settings_entity_header.xml

+4 −23
Original line number Diff line number Diff line
@@ -18,38 +18,19 @@ 
<RelativeLayout

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

    android:id="@+id/entity_header"

    style="@style/EntityHeader"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:orientation="horizontal">

    style="@style/SettingsLibEntityHeader">



    <LinearLayout

        android:id="@+id/entity_header_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_centerHorizontal="true"

        android:gravity="center_horizontal"

        android:orientation="vertical">

        style="@style/SettingsLibEntityHeaderContent">



        <ImageView

            android:id="@+id/entity_header_icon"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:scaleType="fitCenter"

            android:antialias="true"/>

            style="@style/SettingsLibEntityHeaderIcon"/>



        <TextView

            android:id="@+id/entity_header_title"

            style="@style/TextAppearance.EntityHeaderTitle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="false"

            android:gravity="center"

            android:ellipsize="marquee"

            android:textDirection="locale"

            android:layout_marginTop="8dp"/>

            style="@style/SettingsLibEntityHeaderTitle"/>



        <TextView

            android:id="@+id/install_type"

packages/SettingsLib/LayoutPreference/res/values/styles.xml

+34 −1
Original line number Diff line number Diff line
@@ -22,6 +22,39 @@ 
        <item name="android:paddingEnd">16dp</item>

    </style>



    <style name="SettingsLibEntityHeader" parent="EntityHeader">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:paddingStart">?android:attr/listPreferredItemPaddingStart</item>

        <item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEnd</item>

    </style>



    <style name="SettingsLibEntityHeaderContent">

        <item name="android:layout_width">wrap_content</item>

        <item name="android:layout_height">wrap_content</item>

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

        <item name="android:orientation">vertical</item>

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

    </style>



    <style name="SettingsLibEntityHeaderIcon">

        <item name="android:layout_width">48dp</item>

        <item name="android:layout_height">48dp</item>

        <item name="android:scaleType">fitCenter</item>

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

    </style>



    <style name="SettingsLibEntityHeaderTitle">

        <item name="android:layout_width">wrap_content</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:layout_marginTop">8dp</item>

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

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

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

        <item name="android:textDirection">locale</item>

        <item name="android:textAppearance">@style/TextAppearance.EntityHeaderTitle</item>

    </style>



    <style name="CrossProfileEntityHeaderIcon">

        <item name="android:layout_width">48dp</item>

        <item name="android:layout_height">48dp</item>